diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_cmds.c | 11 | ||||
| -rw-r--r-- | src/game/g_combat.c | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index ce3a5b36..b822e8b9 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1727,15 +1727,14 @@ void Cmd_Destroy_f( gentity_t *ent ) } else { + if( !g_cheats.integer ) // add a bit to the build timer + { + ent->client->ps.stats[ STAT_MISC ] += + BG_Buildable( traceEnt->s.modelindex )->buildTime / 4; + } G_LogDestruction( traceEnt, ent, MOD_DECONSTRUCT ); G_FreeEntity( traceEnt ); } - - if( !g_cheats.integer ) - { - ent->client->ps.stats[ STAT_MISC ] += - BG_Buildable( traceEnt->s.modelindex )->buildTime / 4; - } } } } diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 80278f9a..aabcbcbe 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -1028,7 +1028,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, { if( targ->buildableTeam == attacker->client->pers.teamSelection ) { - if( !g_friendlyBuildableFire.integer ) + if( !g_friendlyBuildableFire.integer && mod != MOD_DECONSTRUCT + && mod != MOD_SUICIDE ) return; } |