From 9a69b738bfdeb1644c93ed2aa298b0f1d773f4a1 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Fri, 17 Aug 2012 06:18:37 +0000
Subject: [PATCH] Added MISSIONPACK ifdef around GT_1FCTF code.
---
code/game/ai_team.c | 7 ++++++-
code/game/g_team.c | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/code/game/ai_team.c b/code/game/ai_team.c
index 2abcce16..93e7af5d 100644
--- a/code/game/ai_team.c
+++ b/code/game/ai_team.c
@@ -131,7 +131,12 @@ int BotSortTeamMatesByBaseTravelTime(bot_state_t *bs, int *teammates, int maxtea
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
diff --git a/code/game/g_team.c b/code/game/g_team.c
index 31abdf21..679de6d9 100644
--- a/code/game/g_team.c
+++ b/code/game/g_team.c
@@ -298,9 +298,11 @@ void Team_FragBonuses(gentity_t *targ, gentity_t *inflictor, gentity_t *attacker
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;