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

- 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

12
launcher/modManager/cmodlist.cpp
View File

@@ -28,7 +28,7 @@ bool CModEntry::compareVersions(QString lesser, QString greater)
return false;
}
CModEntry::CModEntry(QVariantMap repository, QVariantMap localData, QVariant modSettings, QString modname):
CModEntry::CModEntry(QVariantMap repository, QVariantMap localData, QVariantMap modSettings, QString modname):
repository(repository),
localData(localData),
modSettings(modSettings),
@@ -41,7 +41,7 @@ bool CModEntry::isEnabled() const
if (!isInstalled())
return false;
return modSettings.toBool();
return modSettings["active"].toBool();
}
bool CModEntry::isDisabled() const
@@ -140,7 +140,13 @@ CModEntry CModList::getMod(QString modname) const
QVariantMap repo;
QVariantMap local = localModList[modname].toMap();
QVariant settings = modSettings[modname];
QVariantMap settings;
QVariant conf = modSettings[modname];
if (conf.canConvert<QVariantMap>())
settings = modSettings[modname].toMap();
else
settings.insert("active", conf);
for (auto entry : repositories)
{