games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +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

4
lib/CConfigHandler.cpp
View File

@ -59,7 +59,7 @@ void SettingsStorage::init()
{
JsonNode(ResourceID("config/settings.json")).swap(config);
JsonNode schema(ResourceID("config/defaultSettings.json"));
config.validate(schema);
JsonUtils::validate(config, schema);
}
void SettingsStorage::invalidateNode(const std::vector<std::string> &changedPath)
@ -71,7 +71,7 @@ void SettingsStorage::invalidateNode(const std::vector<std::string> &changedPath
JsonNode schema(ResourceID("config/defaultSettings.json"));
savedConf.Struct().erase("session");
savedConf.minimize(schema);
JsonUtils::minimize(savedConf, schema);
CResourceHandler::get()->createResource("CONFIG/settings.json");