games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

- reordered files in cmake so files with long compile times will be

Browse Source 
compiled first.
- changed format of modSettings.json, VCMI should properly update file
on the first run.
- implemented property "defaultTavern" that acts as default value for
"tavern" entry in hero class and town formats.
This commit is contained in:
Ivan Savenko
2013-11-03 12:07:23 +00:00
parent aa1c193b88
commit c4716d0a9a
28 changed files with 132 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/CModHandler.cpp
View File

@@ -445,17 +445,31 @@ std::vector <TModID> CModHandler::resolveDependencies(std::vector <TModID> input
return output;
}
static void updateModSettingsFormat(JsonNode & config)
{
for (auto & entry : config.Struct())
{
if (entry.second.getType() == JsonNode::DATA_BOOL)
{
entry.second["active"].Bool() = entry.second.Bool();
}
}
}
void CModHandler::initialize(std::vector<std::string> availableMods)
{
std::string confName = "config/modSettings.json";
JsonNode modConfig;
// Porbably new install. Create initial configuration
// Probably new install. Create initial configuration
if (!CResourceHandler::get()->existsResource(ResourceID(confName)))
CResourceHandler::get()->createResource(confName);
else
modConfig = JsonNode(ResourceID(confName));
// mod compatibility: check if modSettings has old, 0.94 format
updateModSettingsFormat(modConfig["activeMods"]);
const JsonNode & modList = modConfig["activeMods"];
JsonNode resultingList;
@@ -473,12 +487,12 @@ void CModHandler::initialize(std::vector<std::string> availableMods)
if (config.isNull())
continue;
if (!modList[name].isNull() && modList[name].Bool() == false )
if (!modList[name].isNull() && modList[name]["active"].Bool() == false )
{
resultingList[name].Bool() = false;
resultingList[name]["active"].Bool() = false;
continue; // disabled mod
}
resultingList[name].Bool() = true;
resultingList[name]["active"].Bool() = true;
CModInfo & mod = allMods[name];