[quake3-commits] r2308 - trunk/code/game

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-08-17 02:18:37 -0400 (Fri, 17 Aug 2012)
New Revision: 2308

Modified:
   trunk/code/game/ai_team.c
   trunk/code/game/g_team.c
Log:
Added MISSIONPACK ifdef around GT_1FCTF code.

Modified: trunk/code/game/ai_team.c
===================================================================
--- trunk/code/game/ai_team.c	2012-08-16 21:38:02 UTC (rev 2307)
+++ trunk/code/game/ai_team.c	2012-08-17 06:18:37 UTC (rev 2308)
@@ -131,7 +131,12 @@
 	int traveltimes[MAX_CLIENTS];
 	bot_goal_t *goal = NULL;
 
-	if (gametype == GT_CTF || gametype == GT_1FCTF) {
+#ifdef MISSIONPACK
+	if (gametype == GT_CTF || gametype == GT_1FCTF)
+#else
+	if (gametype == GT_CTF)
+#endif
+	{
 		if (BotTeam(bs) == TEAM_RED)
 			goal = &ctf_redflag;
 		else

Modified: trunk/code/game/g_team.c
===================================================================
--- trunk/code/game/g_team.c	2012-08-16 21:38:02 UTC (rev 2307)
+++ trunk/code/game/g_team.c	2012-08-17 06:18:37 UTC (rev 2308)
@@ -298,9 +298,11 @@
 		enemy_flag_pw = PW_REDFLAG;
 	}
 
+#ifdef MISSIONPACK
 	if (g_gametype.integer == GT_1FCTF) {
 		enemy_flag_pw = PW_NEUTRALFLAG;
 	} 
+#endif
 
 	// did the attacker frag the flag carrier?
 	tokens = 0;