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

Modding-related bugfixes:

Browse Source 
- hero classes will be loaded correctly
- objects without index will have correctly assigned ID's
This commit is contained in:
Ivan Savenko
2014-06-30 17:11:25 +03:00
parent 50dfe05cd1
commit db221829aa
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mapObjects/CObjectClassesHandler.cpp
View File

@ -140,7 +140,7 @@ si32 selectNextID(const JsonNode & fixedID, const Map & map, si32 defaultID)
if (map.empty())
return defaultID; // no objects loaded, keep gap for H3M objects
if (map.rbegin()->first > defaultID)
if (map.rbegin()->first >= defaultID)
return map.rbegin()->first + 1; // some modded objects loaded, return next available
return defaultID; // some H3M objects loaded, first modded found
@ -172,9 +172,10 @@ void CObjectClassesHandler::loadObjectEntry(const JsonNode & entry, ObjectContai
}
legacyTemplates.erase(range.first, range.second);
}
obj->objects[id] = handler;
logGlobal->debugStream() << "Loaded object " << obj->id << ":" << id;
assert(!obj->objects.count(id)); // DO NOT override
obj->objects[id] = handler;
}
CObjectClassesHandler::ObjectContainter * CObjectClassesHandler::loadFromJson(const JsonNode & json)