Merge remote-tracking branch 'origin/pr/17' into pullrequest17
This commit is contained in:
commit
a510150ef5
|
@ -620,15 +620,15 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
|
||||||
resource.setAmountPercentage(0);
|
resource.setAmountPercentage(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(resourceNode->hasAttribute("loss-value")) {
|
if(resourceNode->hasAttribute("faction-loss-value")) {
|
||||||
resource.setLossValue(resourceNode->getAttribute("loss-value")->getIntValue());
|
resource.setLossValue(resourceNode->getAttribute("faction-loss-value")->getIntValue());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
resource.setLossValue(0);
|
resource.setLossValue(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(resourceNode->hasAttribute("loss-percentage")) {
|
if(resourceNode->hasAttribute("faction-loss-percentage")) {
|
||||||
resource.setLossPercentage(resourceNode->getAttribute("loss-percentage")->getIntValue());
|
resource.setLossPercentage(resourceNode->getAttribute("faction-loss-percentage")->getIntValue());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
resource.setLossPercentage(0);
|
resource.setLossPercentage(0);
|
||||||
|
|
Loading…
Reference in New Issue