games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fix json value reader

Browse Source
This commit is contained in:
nordsoft
2023-04-28 05:12:54 +04:00
committed by Nordsoft91
parent 59bc9326e9
commit 35a505288b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/JsonRandom.cpp
View File

@@ -43,12 +43,16 @@ namespace JsonRandom
size_t index= rng.getIntRange(0, vector.size()-1)(); size_t index= rng.getIntRange(0, vector.size()-1)();
return loadValue(vector[index], rng, 0); return loadValue(vector[index], rng, 0);
} }
if(value.isStruct())
{
if (!value["amount"].isNull()) if (!value["amount"].isNull())
return static_cast<si32>(loadValue(value["amount"], rng, defaultValue)); return static_cast<si32>(loadValue(value["amount"], rng, defaultValue));
si32 min = static_cast<si32>(loadValue(value["min"], rng, 0)); si32 min = static_cast<si32>(loadValue(value["min"], rng, 0));
si32 max = static_cast<si32>(loadValue(value["max"], rng, 0)); si32 max = static_cast<si32>(loadValue(value["max"], rng, 0));
return rng.getIntRange(min, max)(); return rng.getIntRange(min, max)();
} }
return defaultValue;
}
std::string loadKey(const JsonNode & value, CRandomGenerator & rng, const std::set<std::string> & valuesSet) std::string loadKey(const JsonNode & value, CRandomGenerator & rng, const std::set<std::string> & valuesSet)
{ {