summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorMikko Tiusanen <ams@daug.net>2015-07-08 01:09:58 +0300
committerMikko Tiusanen <ams@daug.net>2015-07-08 01:09:58 +0300
commitdc5cc800f856c82f4f8961dd9c1225c3fa4670bc (patch)
treec47776428534e0340fd43efb392ef192d43e0aba /src/game
parent4c0afec94806a7cf4f8c15e83e5c2906aa7df3a9 (diff)
Removed the minimum team size limit from stage threshold scaling and moved grenades to s3.
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_misc.c2
-rw-r--r--src/game/g_main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index cbd3612..8f6da8e 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -3834,7 +3834,7 @@ static const upgradeAttributes_t bg_upgrades[ ] =
{
UP_GRENADE, //int upgradeNum;
GRENADE_PRICE, //int price;
- STAGE_GE_4, //int stages
+ STAGE_GE_3, //int stages
SLOT_NONE, //int slots;
"gren", //char *upgradeName;
"[yenade]Grenade", //char *humanName;
diff --git a/src/game/g_main.c b/src/game/g_main.c
index a056fa2..a07347e 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -1562,8 +1562,8 @@ G_CalculateStages
*/
void G_CalculateStages( void )
{
- float alienPlayerCountMod = MAX(4,level.averageNumAlienClients) / PLAYER_COUNT_MOD;
- float humanPlayerCountMod = MAX(4,level.averageNumHumanClients) / PLAYER_COUNT_MOD;
+ float alienPlayerCountMod = level.averageNumAlienClients / PLAYER_COUNT_MOD;
+ float humanPlayerCountMod = level.averageNumHumanClients / PLAYER_COUNT_MOD;
int alienNextStageThreshold, humanNextStageThreshold;
static int lastAlienStageModCount = 1;
static int lastHumanStageModCount = 1;