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

- improved detection of missing files

Browse Source 
Now vcmi will detect situations when file is present in another mod
which is not marked as dependency
This commit is contained in:
Ivan Savenko
2013-12-13 08:53:44 +00:00
parent ed329c5a1f
commit c7899fc14a
3 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/CModHandler.cpp
View File

@ -551,6 +551,12 @@ static JsonNode loadModSettings(std::string path)
return JsonNode();
}
JsonNode addMeta(JsonNode config, std::string meta)
{
config.setMeta(meta);
return std::move(config);
}
CModInfo::CModInfo(std::string identifier,const JsonNode & local, const JsonNode & config):
identifier(identifier),
name(config["name"].String()),
@ -558,7 +564,7 @@ CModInfo::CModInfo(std::string identifier,const JsonNode & local, const JsonNode
dependencies(config["depends"].convertTo<std::set<std::string> >()),
conflicts(config["conflicts"].convertTo<std::set<std::string> >()),
validation(PENDING),
config(config)
config(addMeta(config, identifier))
{
loadLocalData(local);
}
@ -577,6 +583,7 @@ JsonNode CModInfo::saveLocalData()
void CModInfo::updateChecksum(ui32 newChecksum)
{
// comment-out next line to force validation of all mods ignoring checksum
if (newChecksum != checksum)
{
checksum = newChecksum;