diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2011-08-01 23:44:50 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:18:11 +0000 |
| commit | c96977d5d3058311e8632a90e191979347d69eb4 (patch) | |
| tree | 3e22a87c0428bb529934628890346c85397d28b2 | |
| parent | bf97377b9eec8216dd18a538033aaa780091ba2f (diff) | |
* (bug 5007) Minor improvements to target_*_win for better behavior in edge cases (/dev/humancontroller)
| -rw-r--r-- | src/game/g_main.c | 3 | ||||
| -rw-r--r-- | src/game/g_target.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index 44ed6182..5aea9b7a 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -2055,7 +2055,8 @@ void CheckExitRules( void ) } if( level.uncondHumanWin || - ( ( level.time > level.startTime + 1000 ) && + ( !level.uncondAlienWin && + ( level.time > level.startTime + 1000 ) && ( level.numAlienSpawns == 0 ) && ( level.numLiveAlienClients == 0 ) ) ) { diff --git a/src/game/g_target.c b/src/game/g_target.c index 53df65cb..3157c8f1 100644 --- a/src/game/g_target.c +++ b/src/game/g_target.c @@ -409,7 +409,8 @@ target_alien_win_use */ void target_alien_win_use( gentity_t *self, gentity_t *other, gentity_t *activator ) { - level.uncondAlienWin = qtrue; + if( !level.uncondHumanWin ) + level.uncondAlienWin = qtrue; } /* @@ -429,7 +430,8 @@ target_human_win_use */ void target_human_win_use( gentity_t *self, gentity_t *other, gentity_t *activator ) { - level.uncondHumanWin = qtrue; + if( !level.uncondAlienWin ) + level.uncondHumanWin = qtrue; } /* |