Skip to content

Commit

Permalink
Added MISSIONPACK ifdef around GT_1FCTF code.
Browse files Browse the repository at this point in the history
  • Loading branch information
zturtleman committed Aug 17, 2012
1 parent b82c02f commit 9a69b73
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 6 additions & 1 deletion code/game/ai_team.c
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions code/game/g_team.c
Expand Up @@ -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;
Expand Down

0 comments on commit 9a69b73

Please sign in to comment.