[iortcw] 82/152: All: Fix bot team order to kill last player it killed

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.5a
in repository iortcw.

commit bb2915dbb53b5dad6bdaf27d5a38313d718ae35a
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Mon Jul 11 06:51:54 2016 -0400

    All: Fix bot team order to kill last player it killed
---
 MP/code/game/ai_dmnet.c | 3 +--
 SP/code/game/ai_dmnet.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/MP/code/game/ai_dmnet.c b/MP/code/game/ai_dmnet.c
index 47da977..843d462 100644
--- a/MP/code/game/ai_dmnet.c
+++ b/MP/code/game/ai_dmnet.c
@@ -514,11 +514,10 @@ int BotGetLongTermGoal( bot_state_t *bs, int tfl, int retreat, bot_goal_t *goal
 			bs->teammessage_time = 0;
 		}
 		//
-		if ( bs->lastkilledplayer == bs->teamgoal.entitynum ) {
+		if (bs->killedenemy_time > bs->teamgoal_time - TEAM_KILL_SOMEONE && bs->lastkilledplayer == bs->teamgoal.entitynum) {
 			EasyClientName( bs->teamgoal.entitynum, buf, sizeof( buf ) );
 			BotAI_BotInitialChat( bs, "kill_done", buf, NULL );
 			trap_BotEnterChat( bs->cs, bs->client, CHAT_TEAM );
-			bs->lastkilledplayer = -1;
 			bs->ltgtype = 0;
 		}
 		//
diff --git a/SP/code/game/ai_dmnet.c b/SP/code/game/ai_dmnet.c
index b6a3898..ad8c031 100644
--- a/SP/code/game/ai_dmnet.c
+++ b/SP/code/game/ai_dmnet.c
@@ -514,11 +514,10 @@ int BotGetLongTermGoal( bot_state_t *bs, int tfl, int retreat, bot_goal_t *goal
 			bs->teammessage_time = 0;
 		}
 		//
-		if ( bs->lastkilledplayer == bs->teamgoal.entitynum ) {
+		if (bs->killedenemy_time > bs->teamgoal_time - TEAM_KILL_SOMEONE && bs->lastkilledplayer == bs->teamgoal.entitynum) {
 			EasyClientName( bs->teamgoal.entitynum, buf, sizeof( buf ) );
 			BotAI_BotInitialChat( bs, "kill_done", buf, NULL );
 			trap_BotEnterChat( bs->cs, bs->client, CHAT_TEAM );
-			bs->lastkilledplayer = -1;
 			bs->ltgtype = 0;
 		}
 		//

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git