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

Merge remote-tracking branch 'origin/pr/17' into pullrequest17

This commit is contained in:
titiger 2014-07-22 23:24:49 +02:00
parent a510150ef5 fbde1e69a3
commit af634f24e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/glest_game/types/unit_type.cpp
View File

@ -613,15 +613,15 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
resource.setAmountValue(0);
}
if(resourceNode->hasAttribute("amount-percentage")) {
resource.setAmountPercentage(resourceNode->getAttribute("amount-percentage")->getIntValue());
if(resourceNode->hasAttribute("faction-amount-percentage")) {
resource.setAmountPercentage(resourceNode->getAttribute("faction-amount-percentage")->getIntValue());
}
else {
resource.setAmountPercentage(0);
}
if(resourceNode->hasAttribute("faction-loss-value")) {
resource.setLossValue(resourceNode->getAttribute("faction-loss-value")->getIntValue());
if(resourceNode->hasAttribute("loss-value")) {
resource.setLossValue(resourceNode->getAttribute("loss-value")->getIntValue());
}
else {
resource.setLossValue(0);