games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +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

18
lib/mapObjects/CommonConstructors.cpp
View File

@@ -264,7 +264,7 @@ void CBankInstanceConstructor::initTypeData(const JsonNode & input)
{
//TODO: name = input["name"].String();
levels = input["levels"].Vector();
bankResetDuration = input["resetDuration"].Float();
bankResetDuration = static_cast<si32>(input["resetDuration"].Float());
}
CGObjectInstance *CBankInstanceConstructor::create(const ObjectTemplate & tmpl) const
@@ -276,22 +276,22 @@ BankConfig CBankInstanceConstructor::generateConfig(const JsonNode & level, CRan
{
BankConfig bc;
bc.chance = level["chance"].Float();
bc.chance = static_cast<ui32>(level["chance"].Float());
bc.guards = JsonRandom::loadCreatures(level["guards"], rng);
bc.upgradeChance = level["upgrade_chance"].Float();
bc.combatValue = level["combat_value"].Float();
bc.upgradeChance = static_cast<ui32>(level["upgrade_chance"].Float());
bc.combatValue = static_cast<ui32>(level["combat_value"].Float());
std::vector<SpellID> spells;
for (size_t i=0; i<6; i++)
IObjectInterface::cb->getAllowedSpells(spells, i);
IObjectInterface::cb->getAllowedSpells(spells, static_cast<ui16>(i));
bc.resources = Res::ResourceSet(level["reward"]["resources"]);
bc.creatures = JsonRandom::loadCreatures(level["reward"]["creatures"], rng);
bc.artifacts = JsonRandom::loadArtifacts(level["reward"]["artifacts"], rng);
bc.spells = JsonRandom::loadSpells(level["reward"]["spells"], rng, spells);
bc.value = level["value"].Float();
bc.value = static_cast<ui32>(level["value"].Float());
return bc;
}
@@ -304,7 +304,7 @@ void CBankInstanceConstructor::configureObject(CGObjectInstance * object, CRando
si32 totalChance = 0;
for (auto & node : levels)
totalChance += node["chance"].Float();
totalChance += static_cast<si32>(node["chance"].Float());
assert(totalChance != 0);
@@ -313,7 +313,7 @@ void CBankInstanceConstructor::configureObject(CGObjectInstance * object, CRando
int cumulativeChance = 0;
for (auto & node : levels)
{
cumulativeChance += node["chance"].Float();
cumulativeChance += static_cast<int>(node["chance"].Float());
if (selectedChance < cumulativeChance)
{
bank->setConfig(generateConfig(node, rng));
@@ -406,7 +406,7 @@ TPossibleGuards CBankInfo::getPossibleGuards() const
//TODO: add fields for flyers, walkers etc...
}
ui8 chance = configEntry["chance"].Float();
ui8 chance = static_cast<ui8>(configEntry["chance"].Float());
out.push_back(std::make_pair(chance, army));
}
return out;