diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2011-03-03 07:16:39 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:18:02 +0000 |
| commit | f5fc851f86c403030162c390d72b5551af407853 (patch) | |
| tree | c57fc8038244b433b61a679af34f59e5b06a282f /src/game/g_buildable.c | |
| parent | c39f29dc3a1747113a271fde74ba064626f915ea (diff) | |
* Fix revert while the game is paused from killing players in the way without attempting to push them first. (thanks Rezyn)
Diffstat (limited to 'src/game/g_buildable.c')
| -rw-r--r-- | src/game/g_buildable.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 2be2bf45..4e2610db 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -4273,7 +4273,7 @@ void G_BuildLogRevertThink( gentity_t *ent ) int victims = 0; int i; - if( ent->suicideTime > level.time ) + if( ent->suicideTime > 0 ) { BG_BuildableBoundingBox( ent->s.modelindex, mins, maxs ); VectorAdd( ent->s.pos.trBase, mins, mins ); @@ -4295,6 +4295,8 @@ void G_BuildLogRevertThink( gentity_t *ent ) } } + ent->suicideTime--; + if( victims ) { // still a blocker @@ -4366,7 +4368,9 @@ void G_BuildLogRevert( int id ) builder->think = G_BuildLogRevertThink; builder->nextthink = level.time + FRAMETIME; - builder->suicideTime = level.time + 3000; + + // Number of thinks before giving up and killing players in the way + builder->suicideTime = 30; if( log->fate == BF_DESTROY || log->fate == BF_TEAMKILL ) { |