From 96815e184b91cbc10001069afe4842770c07424f Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Thu, 6 Jun 2002 20:04:10 +0000
Subject: [PATCH] Checking teams

---
 reaction/game/ai_dmq3.c | 29 +++++++++++++++++-----
 reaction/game/game.plg  | 55 -----------------------------------------
 2 files changed, 23 insertions(+), 61 deletions(-)

diff --git a/reaction/game/ai_dmq3.c b/reaction/game/ai_dmq3.c
index 64beb15e..2abc7f24 100644
--- a/reaction/game/ai_dmq3.c
+++ b/reaction/game/ai_dmq3.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.41  2002/06/06 20:04:10  makro
+// Checking teams
+//
 // Revision 1.40  2002/06/01 13:37:02  makro
 // Tweaked bandaging code
 //
@@ -3514,6 +3517,7 @@ BotSameTeam
 */
 int BotSameTeam(bot_state_t *bs, int entnum) {
 	char info1[1024], info2[1024];
+	int team1, team2;
 
 	if (bs->client < 0 || bs->client >= MAX_CLIENTS) {
 		//BotAI_Print(PRT_ERROR, "BotSameTeam: client out of range\n");
@@ -3524,10 +3528,22 @@ int BotSameTeam(bot_state_t *bs, int entnum) {
 		return qfalse;
 	}
 	if ( gametype >= GT_TEAM ) {
-		trap_GetConfigstring(CS_PLAYERS+bs->client, info1, sizeof(info1));
-		trap_GetConfigstring(CS_PLAYERS+entnum, info2, sizeof(info2));
-		//
-		if (atoi(Info_ValueForKey(info1, "t")) == atoi(Info_ValueForKey(info2, "t"))) return qtrue;
+		//Makro - added teamplay code; changed some stuff
+		if ( gametype != GT_TEAMPLAY ) {
+			trap_GetConfigstring(CS_PLAYERS+bs->client, info1, sizeof(info1));
+			trap_GetConfigstring(CS_PLAYERS+entnum, info2, sizeof(info2));
+			//
+			team1 = atoi(Info_ValueForKey(info1, "t"));
+			team2 = atoi(Info_ValueForKey(info2, "t"));
+		} else {
+			team1 = g_entities[bs->client].client->sess.savedTeam;
+			team2 = g_entities[entnum].client->sess.savedTeam;
+		}
+		if (team1 == TEAM_SPECTATOR || team2 == TEAM_SPECTATOR)
+			return qfalse;
+		if (team1 == team2)
+			return qtrue;
+
 	}
 	return qfalse;
 }
@@ -4970,8 +4986,8 @@ void BotEnableActivateGoalAreas(bot_activategoal_t *activategoal, int enable) {
 			return;
 	for (i = 0; i < activategoal->numareas; i++)
 		trap_AAS_EnableRoutingArea( activategoal->areas[i], enable );
-	activategoal->areasdisabled = !enable;
-		}
+		activategoal->areasdisabled = !enable;
+	}
 
 /*
 ==================
@@ -5108,6 +5124,7 @@ int BotGetActivateGoal(bot_state_t *bs, int entitynum, bot_activategoal_t *activ
 					return 0;
 				} else {
 					BotMoveTowardsEnt(bs, entinfo.origin, -80);
+					//BotMoveTowardsEnt(bs, g_entities[entinfo.number].s.origin2, -80);
 					//BotFuncDoorRotatingActivateGoal(bs, ent, activategoal);
 					Cmd_OpenDoor( &g_entities[bs->entitynum] );
 					return 0;
diff --git a/reaction/game/game.plg b/reaction/game/game.plg
index dff966e1..3551c986 100644
--- a/reaction/game/game.plg
+++ b/reaction/game/game.plg
@@ -6,61 +6,6 @@
 --------------------Configuration: game - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1AF.tmp" with contents
-[
-/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c 
-"C:\Games\Quake3\rq3source\reaction\game\g_trigger.c"
-]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1AF.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B0.tmp" with contents
-[
-kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib" 
-\reactionoutput\ai_chat.obj
-\reactionoutput\ai_cmd.obj
-\reactionoutput\ai_dmnet.obj
-\reactionoutput\ai_dmq3.obj
-\reactionoutput\ai_main.obj
-\reactionoutput\ai_team.obj
-\reactionoutput\ai_vcmd.obj
-\reactionoutput\bg_misc.obj
-\reactionoutput\bg_pmove.obj
-\reactionoutput\bg_slidemove.obj
-\reactionoutput\g_active.obj
-\reactionoutput\g_arenas.obj
-\reactionoutput\g_bot.obj
-\reactionoutput\g_client.obj
-\reactionoutput\g_cmds.obj
-\reactionoutput\g_combat.obj
-\reactionoutput\g_fileio.obj
-\reactionoutput\g_items.obj
-\reactionoutput\g_main.obj
-\reactionoutput\g_matchmode.obj
-\reactionoutput\g_mem.obj
-\reactionoutput\g_misc.obj
-\reactionoutput\g_missile.obj
-\reactionoutput\g_mover.obj
-\reactionoutput\g_session.obj
-\reactionoutput\g_spawn.obj
-\reactionoutput\g_svcmds.obj
-\reactionoutput\g_syscalls.obj
-\reactionoutput\g_target.obj
-\reactionoutput\g_team.obj
-\reactionoutput\g_teamplay.obj
-\reactionoutput\g_trigger.obj
-\reactionoutput\g_utils.obj
-\reactionoutput\g_weapon.obj
-\reactionoutput\q_math.obj
-\reactionoutput\q_shared.obj
-\reactionoutput\rxn_game.obj
-\reactionoutput\zcam.obj
-\reactionoutput\zcam_target.obj
-]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1B0.tmp"
-<h3>Output Window</h3>
-Compiling...
-g_trigger.c
-Linking...
-   Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp