Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix again for negative upgrade sums

This commit is contained in:
Mark Vejvoda 2011-06-26 03:59:28 +00:00
parent a3cd886b9d
commit 26bf93eeed
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/glest_game/types/skill_type.cpp
View File

@ -381,7 +381,9 @@ string MoveSkillType::toString() const{
}
int MoveSkillType::getTotalSpeed(const TotalUpgrade *totalUpgrade) const{
return speed + totalUpgrade->getMoveSpeed();
int result = speed + totalUpgrade->getMoveSpeed();
result = max(0,result);
return result;
}
// =====================================================
@ -521,11 +523,15 @@ string AttackSkillType::toString() const{
//get totals
int AttackSkillType::getTotalAttackStrength(const TotalUpgrade *totalUpgrade) const{
return attackStrength + totalUpgrade->getAttackStrength();
int result = attackStrength + totalUpgrade->getAttackStrength();
result = max(0,result);
return result;
}
int AttackSkillType::getTotalAttackRange(const TotalUpgrade *totalUpgrade) const{
return attackRange + totalUpgrade->getAttackRange();
int result = attackRange + totalUpgrade->getAttackRange();
result = max(0,result);
return result;
}
// =====================================================
@ -577,7 +583,9 @@ string ProduceSkillType::toString() const{
}
int ProduceSkillType::getTotalSpeed(const TotalUpgrade *totalUpgrade) const{
return speed + totalUpgrade->getProdSpeed();
int result = speed + totalUpgrade->getProdSpeed();
result = max(0,result);
return result;
}
// =====================================================
@ -593,7 +601,9 @@ string UpgradeSkillType::toString() const{
}
int UpgradeSkillType::getTotalSpeed(const TotalUpgrade *totalUpgrade) const{
return speed + totalUpgrade->getProdSpeed();
int result = speed + totalUpgrade->getProdSpeed();
result = max(0,result);
return result;
}
// =====================================================
@ -621,7 +631,9 @@ string MorphSkillType::toString() const{
}
int MorphSkillType::getTotalSpeed(const TotalUpgrade *totalUpgrade) const{
return speed + totalUpgrade->getProdSpeed();
int result = speed + totalUpgrade->getProdSpeed();
result = max(0,result);
return result;
}
// =====================================================