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

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-06-18 12:14:48 -0400 (Mon, 18 Jun 2012)
New Revision: 2260

Modified:
   trunk/code/game/g_team.c
Log:
non-missionpack build throws up a few "0" plums

found by Ensiform

Modified: trunk/code/game/g_team.c
===================================================================
--- trunk/code/game/g_team.c	2012-06-18 16:11:35 UTC (rev 2259)
+++ trunk/code/game/g_team.c	2012-06-18 16:14:48 UTC (rev 2260)
@@ -768,8 +768,10 @@
 			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 @@
 		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 );