Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cap power at 100,000. (There was forum consensus!) 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9074 4a71c877-e1ca-e34f-864e-861f7616d084
master
Guangcong Luo 2010-01-09 20:20:22 +00:00 committed by Git SVN Gateway
parent e089ceefca
commit 3e5998db68
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/power.c
View File

@ -48,6 +48,7 @@
#define EASY_POWER_MOD 110 #define EASY_POWER_MOD 110
#define NORMAL_POWER_MOD 100 #define NORMAL_POWER_MOD 100
#define HARD_POWER_MOD 90 #define HARD_POWER_MOD 90
#define MAX_POWER 100000
//flag used to check for power calculations to be done or not //flag used to check for power calculations to be done or not
BOOL powerCalculated; BOOL powerCalculated;
@ -159,6 +160,10 @@ void addPower(int player, float quantity)
{ {
ASSERT_OR_RETURN(, player < MAX_PLAYERS, "Bad player (%d)", player); ASSERT_OR_RETURN(, player < MAX_PLAYERS, "Bad player (%d)", player);
asPower[player].currentPower = MAX(0, asPower[player].currentPower + quantity); asPower[player].currentPower = MAX(0, asPower[player].currentPower + quantity);
if (asPower[player].currentPower > MAX_POWER)
{
asPower[player].currentPower = MAX_POWER;
}
} }
/*resets the power calc flag for all players*/ /*resets the power calc flag for all players*/
@ -275,6 +280,10 @@ void updateCurrentPower(POWER_GEN *psPowerGen, UDWORD player)
asPower[player].currentPower += (extractedPower * psPowerGen->multiplier) / 100; asPower[player].currentPower += (extractedPower * psPowerGen->multiplier) / 100;
ASSERT(asPower[player].currentPower >= 0, "negative power"); ASSERT(asPower[player].currentPower >= 0, "negative power");
if (asPower[player].currentPower > MAX_POWER)
{
asPower[player].currentPower = MAX_POWER;
}
} }
// only used in multiplayer games. // only used in multiplayer games.