diff options
Diffstat (limited to 'src/game')
-rw-r--r-- | src/game/g_client.c | 11 | ||||
-rw-r--r-- | src/game/g_combat.c | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/game/g_client.c b/src/game/g_client.c index 33f644d3..24a8f2df 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -548,18 +548,23 @@ void useBody( gentity_t *self, gentity_t *other, gentity_t *activator ) if( activator->client->ps.stats[ STAT_PTEAM ] == PTE_DROIDS ) { + //can't pick teammates bodies to bits + if( !Q_stricmp( self->classname, "droidCorpse" ) ) return; + G_AddPredictableEvent( activator, EV_MENU, MN_D_INFEST ); } else { clientNum = activator->client->ps.clientNum; + numerator = self->credits[ clientNum ]; + class = self->s.clientNum; + //can't pick teammates bodies to bits + if( !Q_stricmp( self->classname, "humanCorpse" ) ) return; + //client has already raided this corpse if( self->creditsHash[ clientNum ] ) return; - numerator = self->credits[ clientNum ]; - class = self->s.clientNum; - //total up all the damage done by every client for( i = 0; i < MAX_CLIENTS; i++ ) total += self->credits[ i ]; diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 12953de0..8532e4c4 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -219,7 +219,8 @@ void body_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int d return; } - GibEntity( self, 0 ); + //TA: no gibbing + //GibEntity( self, 0 ); } |