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

Use ResourcePath for referencing texts and json's

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-02 00:26:14 +03:00
parent 823ffa7a07
commit 6f0108e462
51 changed files with 124 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CConfigHandler.cpp
View File

@ -55,12 +55,12 @@ SettingsStorage::SettingsStorage():
void SettingsStorage::init()
{
std::string confName = "config/settings.json";
JsonPath confName = JsonPath::builtin("config/settings.json");
JsonUtils::assembleFromFiles(confName).swap(config);
JsonUtils::assembleFromFiles(confName.getOriginalName()).swap(config);
// Probably new install. Create config file to save settings to
if (!CResourceHandler::get("local")->existsResource(ResourcePath(confName)))
if (!CResourceHandler::get("local")->existsResource(confName))
CResourceHandler::get("local")->createResource(confName);
JsonUtils::maximize(config, "vcmi:settings");