games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

- moved json-related functions (e.g. ParseBonus) into JsonUtils namespace

Browse Source 
- replaced JsonNode::toStdVector with more universal convertTo
- some renaming in StartInfo
This commit is contained in:
Ivan Savenko
2012-12-02 12:21:44 +00:00
parent ca9033d0e4
commit c9dd80ea6d
20 changed files with 340 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/CTownHandler.cpp
View File

@@ -394,7 +394,7 @@ void CTownHandler::loadTown(CTown &town, const JsonNode & source)
town.mageLevel = source["mageGuild"].Float();
town.primaryRes = source["primaryResource"].Float();
town.warMachine = source["warMachine"].Float();
town.names = source["names"].StdVector<std::string>();
town.names = source["names"].convertTo<std::vector<std::string> >();
// Horde building creature level
BOOST_FOREACH(const JsonNode &node, source["horde"].Vector())
@@ -515,7 +515,7 @@ void CTownHandler::load()
JsonNode & legacyBuilding = legacyBuildings[building["id"].Float()];
if (!legacyBuilding.isNull()) //merge if h3 config was found for this building
JsonNode::merge(building, legacyBuilding);
JsonUtils::merge(building, legacyBuilding);
}
}
}
@@ -523,12 +523,12 @@ void CTownHandler::load()
load(buildingsConf);
}
std::set<ui32> CTownHandler::getDefaultAllowedFactions() const
std::set<TFaction> CTownHandler::getDefaultAllowedFactions() const
{
std::set<ui32> allowedFactions;
for(int i = 0; i <= 8; ++i)
std::set<TFaction> allowedFactions;
BOOST_FOREACH(auto town, towns)
{
allowedFactions.insert(i);
allowedFactions.insert(town.first);
}
return allowedFactions;
}