ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-12-13 21:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

non-missionpack build throws up a few "0" plums

Browse source 
found by Ensiform
This commit is contained in:
Zack Middleton 2012-06-18 16:14:48 +00:00
parent 2834a58600
commit c3ca5c1caa
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/game/g_team.c
View file

@ -768,8 +768,10 @@ int Team_TouchOurFlag( gentity_t *ent, gentity_t *other, int team ) {
player->client->pers.teamState.lasthurtcarrier = -5; player->client->pers.teamState.lasthurtcarrier = -5;
} else if (player->client->sess.sessionTeam == } else if (player->client->sess.sessionTeam ==
cl->sess.sessionTeam) { cl->sess.sessionTeam) {
#ifdef MISSIONPACK
if (player != other) if (player != other)
AddScore(player, ent->r.currentOrigin, CTF_TEAM_BONUS); AddScore(player, ent->r.currentOrigin, CTF_TEAM_BONUS);
#endif
// award extra points for capture assists // award extra points for capture assists
if (player->client->pers.teamState.lastreturnedflag + if (player->client->pers.teamState.lastreturnedflag +
CTF_RETURN_FLAG_ASSIST_TIMEOUT > level.time) { 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 ); Team_SetFlagStatus( team, FLAG_TAKEN );
#ifdef MISSIONPACK #ifdef MISSIONPACK
} }
#endif
AddScore(other, ent->r.currentOrigin, CTF_FLAG_BONUS); AddScore(other, ent->r.currentOrigin, CTF_FLAG_BONUS);
#endif
cl->pers.teamState.flagsince = level.time; cl->pers.teamState.flagsince = level.time;
Team_TakeFlagSound( ent, team ); Team_TakeFlagSound( ent, team );