diff options
| author | Tony J. White <tjw@tjw.org> | 2007-03-16 23:01:57 +0000 |
|---|---|---|
| committer | Tony J. White <tjw@tjw.org> | 2007-03-16 23:01:57 +0000 |
| commit | a275cd8f1cc7c5e66198ff5889cc837c2d77189a (patch) | |
| tree | 4a19337e750264b28c243b9624379bbec1b78fd5 | |
| parent | afde82fd3f01fef91de6e0646d25ce918c0d2399 (diff) | |
* (bug 2989) my last "stfu overmind" patch did just the opposite when
timelimit was infinite. Now it's tracked properly with
level.overmindMuted instead of using the time hack.
| -rw-r--r-- | src/game/g_buildable.c | 8 | ||||
| -rw-r--r-- | src/game/g_local.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 959765f8..abe39448 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -755,10 +755,11 @@ void AOvermind_Think( gentity_t *self ) // just in case an egg finishes building after we tell overmind to stfu if( level.numAlienSpawns > 0 ) - self->overmindSpawnsTimer = level.time; + level.overmindMuted = qfalse; //low on spawns - if( level.numAlienSpawns <= 0 && level.time > self->overmindSpawnsTimer ) + if( !level.overmindMuted && level.numAlienSpawns <= 0 && + level.time > self->overmindSpawnsTimer ) { qboolean haveBuilder = qfalse; gentity_t *builder; @@ -779,8 +780,7 @@ void AOvermind_Think( gentity_t *self ) } // aliens now know they have no eggs, but they're screwed, so stfu if( !haveBuilder || G_TimeTilSuddenDeath( ) <= 0 ) - self->overmindSpawnsTimer = level.startTime + - ( g_timelimit.integer * 60000 ); + level.overmindMuted = qtrue; } //overmind dying diff --git a/src/game/g_local.h b/src/game/g_local.h index 7e96d656..3b423dab 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -627,6 +627,7 @@ typedef struct qboolean reactorPresent; qboolean overmindPresent; + qboolean overmindMuted; int humanBaseAttackTimer; |