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

fixed crash when loading neutral faction; skills.json no longer requires index values

Browse Source
This commit is contained in:
Henning Koehler
2017-08-25 17:17:14 +12:00
parent 0357a4fe3b
commit c0740e3623
6 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CModHandler.cpp
View File

@@ -398,8 +398,14 @@ bool CContentHandler::ContentTypeHandler::loadMod(std::string modName, bool vali
}
else
{
// trace only name field of original data - I miss list comprehension
std::vector<std::string> originalNames;
for (const JsonNode & orgElem : originalData)
originalNames.push_back(orgElem["name"].String());
logger->debugStream() << "no original data in loadMod(" << name << ") at index " << index;
logger->traceStream() << data;
logger->traceStream() << "originalData: " << originalNames;
logger->traceStream() << "new data: " << data;
performValidate(data, name);
handler->loadObject(modName, name, data, index);
}