games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

always load objects with index at specified position

Browse Source
This commit is contained in:
Henning Koehler 2017-08-24 18:01:02 +12:00
parent 64e2db6a0f
commit 8c7895239e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/CModHandler.cpp
View File

@ -390,17 +390,20 @@ bool CContentHandler::ContentTypeHandler::loadMod(std::string modName, bool vali
if (originalData.size() > index) if (originalData.size() > index)
{ {
JsonUtils::merge(originalData[index], data); JsonUtils::merge(originalData[index], data);
performValidate(originalData[index],name); performValidate(originalData[index],name);
handler->loadObject(modName, name, originalData[index], index); handler->loadObject(modName, name, originalData[index], index);
originalData[index].clear(); // do not use same data twice (same ID) originalData[index].clear(); // do not use same data twice (same ID)
continue;
} }
logGlobal->debugStream() << "no original data in loadMod(" << name << "): " << data; else
{
logGlobal->debugStream() << "no original data in loadMod(" << name << ")";
logGlobal->traceStream() << data;
performValidate(data, name);
handler->loadObject(modName, name, data, index);
}
continue;
} }
// normal new object or one with index bigger than data size // normal new object
performValidate(data,name); performValidate(data,name);
handler->loadObject(modName, name, data); handler->loadObject(modName, name, data);
} }