diff options
author | Mikko Tiusanen <ams@daug.net> | 2014-08-01 20:35:04 +0300 |
---|---|---|
committer | Mikko Tiusanen <ams@daug.net> | 2014-08-02 02:51:25 +0300 |
commit | fc765f5f146627d282b4374dd0c575895d64a900 (patch) | |
tree | 25ec1f349984922938a0963a6b066b89021593d4 /src/game/g_main.c | |
parent | df45dd254c4b26f3e0fdb140e370e532f626f8f1 (diff) |
Fixed the drawing order of alien, human stages in spectator view.
Fixed the stage counters for stages 4 and 5.
Reset default values for human stage thresholds to half of what aliens got.
Diffstat (limited to 'src/game/g_main.c')
-rw-r--r-- | src/game/g_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index d123d96..45f7b03 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -1499,9 +1499,9 @@ void G_CalculateStages( void ) else if( g_alienStage.integer == S2 && g_alienMaxStage.integer > S2 ) alienNextStageThreshold = (int)( ceil( (float)g_alienStage3Threshold.integer * alienPlayerCountMod ) ); else if( g_alienStage.integer == S3 && g_alienMaxStage.integer > S3 ) - alienNextStageThreshold = (int)( ceil( (float)g_alienStage3Threshold.integer * alienPlayerCountMod ) ); + alienNextStageThreshold = (int)( ceil( (float)g_alienStage4Threshold.integer * alienPlayerCountMod ) ); else if( g_alienStage.integer == S4 && g_alienMaxStage.integer > S4 ) - alienNextStageThreshold = (int)( ceil( (float)g_alienStage3Threshold.integer * alienPlayerCountMod ) ); + alienNextStageThreshold = (int)( ceil( (float)g_alienStage5Threshold.integer * alienPlayerCountMod ) ); else alienNextStageThreshold = -1; @@ -1510,9 +1510,9 @@ void G_CalculateStages( void ) else if( g_humanStage.integer == S2 && g_humanMaxStage.integer > S2 ) humanNextStageThreshold = (int)( ceil( (float)g_humanStage3Threshold.integer * humanPlayerCountMod ) ); else if( g_humanStage.integer == S3 && g_humanMaxStage.integer > S3 ) - humanNextStageThreshold = (int)( ceil( (float)g_humanStage3Threshold.integer * humanPlayerCountMod ) ); + humanNextStageThreshold = (int)( ceil( (float)g_humanStage4Threshold.integer * humanPlayerCountMod ) ); else if( g_humanStage.integer == S4 && g_humanMaxStage.integer > S4 ) - humanNextStageThreshold = (int)( ceil( (float)g_humanStage3Threshold.integer * humanPlayerCountMod ) ); + humanNextStageThreshold = (int)( ceil( (float)g_humanStage5Threshold.integer * humanPlayerCountMod ) ); else humanNextStageThreshold = -1; |