games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Fixed lots of warnings.

Browse Source 
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
This commit is contained in:
John Bolton
2020-10-01 01:38:06 -07:00
parent ff471af3de
commit a05ae78e67
142 changed files with 854 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/spells/CSpellHandler.cpp
View File

@@ -183,7 +183,7 @@ bool CSpell::canBeCast(spells::Problem & problem, const CBattleInfoCallback * cb
genProblem = ESpellCastProblem::NO_SPELLBOOK;
else if(!castingHero->canCastThisSpell(this))
genProblem = ESpellCastProblem::HERO_DOESNT_KNOW_SPELL;
else if(castingHero->mana < cb->battleGetSpellCost(this, castingHero)) //not enough mana
else if(castingHero->mana < (si32)cb->battleGetSpellCost(this, castingHero)) //not enough mana
genProblem = ESpellCastProblem::NOT_ENOUGH_MANA;
}
break;
@@ -631,7 +631,7 @@ std::vector<JsonNode> CSpellHandler::loadLegacyData(size_t dataSize)
lineNode["name"].String() = parser.readString();
parser.readString(); //ignored unused abbreviated name
lineNode["level"].Integer() = parser.readNumber();
lineNode["level"].Integer() = static_cast<si64>(parser.readNumber());
auto& schools = lineNode["school"].Struct();
@@ -649,13 +649,13 @@ std::vector<JsonNode> CSpellHandler::loadLegacyData(size_t dataSize)
};
auto costs = parser.readNumArray<si32>(GameConstants::SPELL_SCHOOL_LEVELS);
lineNode["power"].Integer() = parser.readNumber();
lineNode["power"].Integer() = static_cast<si64>(parser.readNumber());
auto powers = parser.readNumArray<si32>(GameConstants::SPELL_SCHOOL_LEVELS);
auto & chances = lineNode["gainChance"].Struct();
for(size_t i = 0; i < GameConstants::F_NUMBER; i++)
chances[ETownType::names[i]].Integer() = parser.readNumber();
chances[ETownType::names[i]].Integer() = static_cast<si64>(parser.readNumber());
auto AIVals = parser.readNumArray<si32>(GameConstants::SPELL_SCHOOL_LEVELS);
@@ -744,14 +744,14 @@ CSpell * CSpellHandler::loadFromJson(const JsonNode & json, const std::string &
spell->school[info.id] = schoolNames[info.jsonName].Bool();
}
spell->level = json["level"].Integer();
spell->power = json["power"].Integer();
spell->level = static_cast<si32>(json["level"].Integer());
spell->power = static_cast<si32>(json["power"].Integer());
spell->defaultProbability = json["defaultGainChance"].Integer();
spell->defaultProbability = static_cast<si32>(json["defaultGainChance"].Integer());
for(const auto & node : json["gainChance"].Struct())
{
const int chance = node.second.Integer();
const int chance = static_cast<int>(node.second.Integer());
VLC->modh->identifiers.requestIdentifier(node.second.meta, "faction",node.first, [=](si32 factionID)
{
@@ -910,7 +910,7 @@ CSpell * CSpellHandler::loadFromJson(const JsonNode & json, const std::string &
}
else if(item.isNumber())
{
newItem.pause = item.Float();
newItem.pause = static_cast<int>(item.Float());
}
q.push_back(newItem);
@@ -944,11 +944,11 @@ CSpell * CSpellHandler::loadFromJson(const JsonNode & json, const std::string &
CSpell::LevelInfo & levelObject = spell->levels[levelIndex];
const si32 levelPower = levelObject.power = levelNode["power"].Integer();
const si32 levelPower = levelObject.power = static_cast<si32>(levelNode["power"].Integer());
levelObject.description = levelNode["description"].String();
levelObject.cost = levelNode["cost"].Integer();
levelObject.AIValue = levelNode["aiValue"].Integer();
levelObject.cost = static_cast<si32>(levelNode["cost"].Integer());
levelObject.AIValue = static_cast<si32>(levelNode["aiValue"].Integer());
levelObject.smartTarget = levelNode["targetModifier"]["smart"].Bool();
levelObject.clearTarget = levelNode["targetModifier"]["clearTarget"].Bool();
levelObject.clearAffected = levelNode["targetModifier"]["clearAffected"].Bool();