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

- new mods (not mentioned in modSettings.json) will be enabled by

Browse Source 
default
This commit is contained in:
Ivan Savenko
2014-01-30 14:51:15 +00:00
parent 679c3c5830
commit 27be6a8f13
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
launcher/modManager/cmodlist.cpp
View File

@@ -158,10 +158,17 @@ CModEntry CModList::getMod(QString modname) const
QVariantMap settings; QVariantMap settings;
QVariant conf = modSettings[modname]; QVariant conf = modSettings[modname];
if (conf.canConvert<QVariantMap>()) if (conf.isNull())
settings = modSettings[modname].toMap(); {
settings["active"] = true; // default
}
else else
settings.insert("active", conf); {
if (conf.canConvert<QVariantMap>())
settings = modSettings[modname].toMap();
else
settings.insert("active", conf);
}
for (auto entry : repositories) for (auto entry : repositories)
{ {

2
lib/CModHandler.cpp
View File

@@ -603,7 +603,7 @@ void CModInfo::loadLocalData(const JsonNode & data)
{ {
enabled = data.Bool(); enabled = data.Bool();
} }
else if (data.getType() == JsonNode::DATA_STRUCT)
{ {
enabled = data["active"].Bool(); enabled = data["active"].Bool();
validated = data["validated"].Bool(); validated = data["validated"].Bool();