diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-10 05:31:29 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:45 +0000 |
| commit | c1da521a42a4902a7f788015a74dcbebdf578293 (patch) | |
| tree | 57d7225f39fc53c4f246cee64bd31a23da70f8b9 /src/game | |
| parent | 973713ec7e01dd43a8fab78013992471f56a941a (diff) | |
* Fix adding to the build timer when deconstructing with g_markdeconstruct 0 (thanks Rezyn)
* Fix *not* adding to the build timer when marking things for deconstruction with g_markdeconstruct>0 (thanks Rezyn)
* Fix /destroy not working with g_friendlyBuildableFire 0
Diffstat (limited to 'src/game')
| -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; } |