diff options
| author | enneract <trem.redman@gmail.com> | 2015-01-08 00:42:15 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2015-01-08 00:42:15 +0100 |
| commit | 96bede71e66823dc28a57935e48e4cc7b17f55af (patch) | |
| tree | 26dbd475a40bdf1d3412d5a7d5c9ad23a16c8bd5 /src/game/g_team.c | |
| parent | 96f8e06ec9aa117bb8dd7e8d671d93e3884cb98f (diff) | |
Fix various linking errors and segfaults.
Diffstat (limited to 'src/game/g_team.c')
| -rw-r--r-- | src/game/g_team.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/game/g_team.c b/src/game/g_team.c index 246c072..fd62600 100644 --- a/src/game/g_team.c +++ b/src/game/g_team.c @@ -206,6 +206,11 @@ void G_LeaveTeamReal( gentity_t *self, qboolean reset_score ) if( ent->client->ps.stats[ STAT_STATE ] & SS_POISONED && ent->client->lastPoisonClient == self ) ent->client->ps.stats[ STAT_STATE ] &= ~SS_POISONED; + + // cure infection + if( ent->client->ps.stats[ STAT_STATE ] & SS_INFECTED && + ent->client->lastInfectionClient == self ) + ent->client->ps.stats[ STAT_STATE ] &= ~SS_INFECTED; } else if( ent->s.eType == ET_MISSILE && ent->r.ownerNum == self->s.number ) G_FreeEntity( ent ); @@ -213,14 +218,6 @@ void G_LeaveTeamReal( gentity_t *self, qboolean reset_score ) // cut all relevant zap beams G_ClearPlayerZapEffects( self ); - - // cure infection - if( ent->client->ps.stats[ STAT_STATE ] & SS_INFECTED && - ent->client->lastInfectionClient == self ) - ent->client->ps.stats[ STAT_STATE ] &= ~SS_INFECTED; - - else if( ent->s.eType == ET_MISSILE && ent->r.ownerNum == self->s.number ) - G_FreeEntity( ent ); G_namelog_update_score( self->client ); |