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

Little code improvement

Browse Source
This commit is contained in:
nordsoft
2023-04-08 01:33:48 +04:00
committed by Nordsoft91
parent ab7d316c3f
commit e7c6f596ee
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/mapObjects/JsonRandom.cpp
View File

@@ -48,22 +48,28 @@ namespace JsonRandom
return rng.getIntRange(min, max)(); return rng.getIntRange(min, max)();
} }
std::string loadKey(const JsonNode & value, CRandomGenerator & rng, std::set<std::string> valuesSet) std::string loadKey(const JsonNode & value, CRandomGenerator & rng, const std::set<std::string> & valuesSet)
{ {
if (value.isNull()) if(value.isString())
return valuesSet.empty() ? "" : *RandomGeneratorUtil::nextItem(valuesSet, rng);
if (value.isString())
return value.String(); return value.String();
if (!value["type"].isNull())
return value["type"].String();
if(!value["anyOf"].isNull()) if(value.isStruct())
return RandomGeneratorUtil::nextItem(value["anyOf"].Vector(), rng)->String();
if(!value["noneOf"].isNull())
{ {
for(auto & s : value["noneOf"].Vector()) if(!value["type"].isNull())
valuesSet.erase(s.String()); return value["type"].String();
if(!value["anyOf"].isNull())
return RandomGeneratorUtil::nextItem(value["anyOf"].Vector(), rng)->String();
if(!value["noneOf"].isNull())
{
auto copyValuesSet = valuesSet;
for(auto & s : value["noneOf"].Vector())
copyValuesSet.erase(s.String());
if(!copyValuesSet.empty())
return *RandomGeneratorUtil::nextItem(copyValuesSet, rng);
}
} }
return valuesSet.empty() ? "" : *RandomGeneratorUtil::nextItem(valuesSet, rng); return valuesSet.empty() ? "" : *RandomGeneratorUtil::nextItem(valuesSet, rng);