games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Code Issues Releases Activity

Fix: ID-collisions when processing large mods collections

Browse Source
This commit is contained in:
Dmitry Orlov
2021-04-25 15:07:06 +03:00
parent 4063ab5894
commit 8b08973283
5 changed files with 100 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/mapObjects/CObjectClassesHandler.h
View File

@ -283,8 +283,9 @@ class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase
/// format: customNames[primaryID][secondaryID] -> name
std::map<si32, std::vector<std::string>> customNames;
void loadObjectEntry(const std::string & identifier, const JsonNode & entry, ObjectContainter * obj);
void loadObjectEntry(const std::string & identifier, const JsonNode & entry, ObjectContainter * obj, bool isSubobject = false);
ObjectContainter * loadFromJson(const JsonNode & json, const std::string & name);
public:
CObjectClassesHandler();
~CObjectClassesHandler();