From c3ca5c1caa02c9187c69e65e13d51a7d37fe9c41 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 18 Jun 2012 16:14:48 +0000 Subject: [PATCH] non-missionpack build throws up a few "0" plums found by Ensiform --- code/game/g_team.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/g_team.c b/code/game/g_team.c index c68263ea..31abdf21 100644 --- a/code/game/g_team.c +++ b/code/game/g_team.c @@ -768,8 +768,10 @@ int Team_TouchOurFlag( gentity_t *ent, gentity_t *other, int team ) { player->client->pers.teamState.lasthurtcarrier = -5; } else if (player->client->sess.sessionTeam == cl->sess.sessionTeam) { +#ifdef MISSIONPACK if (player != other) AddScore(player, ent->r.currentOrigin, CTF_TEAM_BONUS); +#endif // award extra points for capture assists if (player->client->pers.teamState.lastreturnedflag + CTF_RETURN_FLAG_ASSIST_TIMEOUT > level.time) { @@ -831,9 +833,9 @@ int Team_TouchEnemyFlag( gentity_t *ent, gentity_t *other, int team ) { Team_SetFlagStatus( team, FLAG_TAKEN ); #ifdef MISSIONPACK } -#endif AddScore(other, ent->r.currentOrigin, CTF_FLAG_BONUS); +#endif cl->pers.teamState.flagsince = level.time; Team_TakeFlagSound( ent, team );