diff --git a/source/glest_game/types/upgrade_type.cpp b/source/glest_game/types/upgrade_type.cpp index 24da5fbf..46a57390 100644 --- a/source/glest_game/types/upgrade_type.cpp +++ b/source/glest_game/types/upgrade_type.cpp @@ -656,7 +656,7 @@ void UpgradeTypeBase::loadGameBoost(const XmlNode *rootNode) { // int maxHp; maxHp = upgradeTypeBaseNode->getAttribute("maxHp")->getIntValue(); // bool maxHpIsMultiplier; - maxHpIsMultiplier = upgradeTypeBaseNode->getAttribute("maxHpIsMultiplier")->getIntValue(); + maxHpIsMultiplier = (upgradeTypeBaseNode->getAttribute("maxHpIsMultiplier")->getIntValue() != 0); // int maxHpRegeneration; maxHpRegeneration = upgradeTypeBaseNode->getAttribute("maxHpRegeneration")->getIntValue(); // //bool maxHpRegenerationIsMultiplier; @@ -664,22 +664,22 @@ void UpgradeTypeBase::loadGameBoost(const XmlNode *rootNode) { // int sight; sight = upgradeTypeBaseNode->getAttribute("sight")->getIntValue(); // bool sightIsMultiplier; - sightIsMultiplier = upgradeTypeBaseNode->getAttribute("sightIsMultiplier")->getIntValue(); + sightIsMultiplier = (upgradeTypeBaseNode->getAttribute("sightIsMultiplier")->getIntValue() != 0); // int maxEp; maxEp = upgradeTypeBaseNode->getAttribute("maxEp")->getIntValue(); // bool maxEpIsMultiplier; - maxEpIsMultiplier = upgradeTypeBaseNode->getAttribute("maxEpIsMultiplier")->getIntValue(); + maxEpIsMultiplier = (upgradeTypeBaseNode->getAttribute("maxEpIsMultiplier")->getIntValue() != 0); // int maxEpRegeneration; maxEpRegeneration = upgradeTypeBaseNode->getAttribute("maxEpRegeneration")->getIntValue(); // //bool maxEpRegenerationIsMultiplier; // int armor; armor = upgradeTypeBaseNode->getAttribute("armor")->getIntValue(); // bool armorIsMultiplier; - armorIsMultiplier = upgradeTypeBaseNode->getAttribute("armorIsMultiplier")->getIntValue(); + armorIsMultiplier = (upgradeTypeBaseNode->getAttribute("armorIsMultiplier")->getIntValue() != 0); // int attackStrength; attackStrength = upgradeTypeBaseNode->getAttribute("attackStrength")->getIntValue(); // bool attackStrengthIsMultiplier; - attackStrengthIsMultiplier = upgradeTypeBaseNode->getAttribute("attackStrengthIsMultiplier")->getIntValue(); + attackStrengthIsMultiplier = (upgradeTypeBaseNode->getAttribute("attackStrengthIsMultiplier")->getIntValue() != 0); // std::map attackStrengthMultiplierValueList; vector attackStrengthMultiplierValueNodeList = upgradeTypeBaseNode->getChildList("attackStrengthMultiplierValueList"); for(unsigned int i = 0; i < attackStrengthMultiplierValueNodeList.size(); ++i) { @@ -691,7 +691,7 @@ void UpgradeTypeBase::loadGameBoost(const XmlNode *rootNode) { // int attackRange; attackRange = upgradeTypeBaseNode->getAttribute("attackRange")->getIntValue(); // bool attackRangeIsMultiplier; - attackRangeIsMultiplier = upgradeTypeBaseNode->getAttribute("attackRangeIsMultiplier")->getIntValue(); + attackRangeIsMultiplier = (upgradeTypeBaseNode->getAttribute("attackRangeIsMultiplier")->getIntValue() != 0); // std::map attackRangeMultiplierValueList; vector attackRangeMultiplierValueNodeList = upgradeTypeBaseNode->getChildList("attackRangeMultiplierValueList"); for(unsigned int i = 0; i < attackRangeMultiplierValueNodeList.size(); ++i) { @@ -704,7 +704,7 @@ void UpgradeTypeBase::loadGameBoost(const XmlNode *rootNode) { // int moveSpeed; moveSpeed = upgradeTypeBaseNode->getAttribute("moveSpeed")->getIntValue(); // bool moveSpeedIsMultiplier; - moveSpeedIsMultiplier = upgradeTypeBaseNode->getAttribute("moveSpeedIsMultiplier")->getIntValue(); + moveSpeedIsMultiplier = (upgradeTypeBaseNode->getAttribute("moveSpeedIsMultiplier")->getIntValue() != 0); // std::map moveSpeedIsMultiplierValueList; vector moveSpeedIsMultiplierValueNodeList = upgradeTypeBaseNode->getChildList("moveSpeedIsMultiplierValueList"); for(unsigned int i = 0; i < moveSpeedIsMultiplierValueNodeList.size(); ++i) { @@ -717,7 +717,7 @@ void UpgradeTypeBase::loadGameBoost(const XmlNode *rootNode) { // int prodSpeed; prodSpeed = upgradeTypeBaseNode->getAttribute("prodSpeed")->getIntValue(); // bool prodSpeedIsMultiplier; - prodSpeedIsMultiplier = upgradeTypeBaseNode->getAttribute("prodSpeedIsMultiplier")->getIntValue(); + prodSpeedIsMultiplier = (upgradeTypeBaseNode->getAttribute("prodSpeedIsMultiplier")->getIntValue() != 0); // std::map prodSpeedProduceIsMultiplierValueList; vector prodSpeedProduceIsMultiplierValueNodeList = upgradeTypeBaseNode->getChildList("prodSpeedProduceIsMultiplierValueList"); for(unsigned int i = 0; i < prodSpeedProduceIsMultiplierValueNodeList.size(); ++i) {