From 1cb1b72c5a95517d16371dc50c2f4e8d8940ae0c Mon Sep 17 00:00:00 2001
From: Roman Tetelman <kevlarman@gmail.com>
Date: Sat, 3 Oct 2009 12:13:47 +0000
Subject: * fix stage counter AGAIN
---
src/game/g_main.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/game/g_main.c b/src/game/g_main.c
index f6dd3575..08188beb 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -1171,16 +1171,18 @@ void G_CalculateBuildPoints( void )
if( humanPlayerCountMod < 0.1f )
humanPlayerCountMod = 0.1f;
- if( g_alienStage.integer < g_alienMaxStage.integer ||
- g_humanStage.integer > S1 )
+ if( g_alienStage.integer < g_alienMaxStage.integer )
+ alienNextStageThreshold = (int)( ceil( (float)g_alienStageThreshold.integer * (g_alienStage.integer + 1) * alienPlayerCountMod ) );
+ else if( g_humanStage.integer > S1 )
alienNextStageThreshold = (int)( ceil( (float)level.alienStagedownCredits + g_alienStageThreshold.integer * alienPlayerCountMod ) );
else
alienNextStageThreshold = -1;
- if( g_humanStage.integer < g_humanMaxStage.integer ||
- g_alienStage.integer > S1 )
- humanNextStageThreshold = (int)( ceil( (float)level.humanStagedownCredits + g_humanStageThreshold.integer * humanPlayerCountMod ) );
+ if( g_humanStage.integer < g_humanMaxStage.integer )
+ humanNextStageThreshold = (int)( ceil( (float)g_humanStageThreshold.integer * (g_humanStage.integer + 1) * humanPlayerCountMod ) );
+ else if( g_alienStage.integer > S1 )
+ humanNextStageThreshold = (int)( ceil( (float)level.humanStagedownCredits + g_humanStageThreshold.integer * humanPlayerCountMod ) );
else
humanNextStageThreshold = -1;
--
cgit