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/JsonRandom.cpp
View File

@@ -28,11 +28,11 @@ namespace JsonRandom
if (value.isNull())
return defaultValue;
if (value.isNumber())
return value.Float();
return static_cast<si32>(value.Float());
if (!value["amount"].isNull())
return value["amount"].Float();
si32 min = value["min"].Float();
si32 max = value["max"].Float();
return static_cast<si32>(value["amount"].Float());
si32 min = static_cast<si32>(value["min"].Float());
si32 max = static_cast<si32>(value["max"].Float());
return rng.getIntRange(min, max)();
}
@@ -89,8 +89,8 @@ namespace JsonRandom
for (auto & entry : value["slot"].Vector())
allowedPositions.insert(VLC->arth->stringToSlot(entry.String()));
if (!value["minValue"].isNull()) minValue = value["minValue"].Float();
if (!value["maxValue"].isNull()) maxValue = value["maxValue"].Float();
if (!value["minValue"].isNull()) minValue = static_cast<ui32>(value["minValue"].Float());
if (!value["maxValue"].isNull()) maxValue = static_cast<ui32>(value["maxValue"].Float());
return VLC->arth->pickRandomArtifact(rng, [=](ArtifactID artID) -> bool
{
@@ -188,11 +188,11 @@ namespace JsonRandom
RandomStackInfo info;
if (!node["amount"].isNull())
info.minAmount = info.maxAmount = node["amount"].Float();
info.minAmount = info.maxAmount = static_cast<si32>(node["amount"].Float());
else
{
info.minAmount = node["min"].Float();
info.maxAmount = node["max"].Float();
info.minAmount = static_cast<si32>(node["min"].Float());
info.maxAmount = static_cast<si32>(node["max"].Float());
}
const CCreature * crea = VLC->creh->creatures[VLC->modh->identifiers.getIdentifier("creature", node["type"]).get()];
info.allowedCreatures.push_back(crea);