games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Avoid crash if object has same name as on provided in compatiblity

Browse Source 
identifiers field
This commit is contained in:
Ivan Savenko
2025-02-25 15:26:16 +00:00
parent bc90f4f4aa
commit b372cc84e9
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mapObjectConstructors/CObjectClassesHandler.cpp
View File

@@ -177,7 +177,12 @@ void CObjectClassesHandler::loadSubObject(const std::string & scope, const std::
registerObject(scope, baseObject->getJsonKey(), subObject->getSubTypeName(), subObject->subtype); registerObject(scope, baseObject->getJsonKey(), subObject->getSubTypeName(), subObject->subtype);
for(const auto & compatID : entry["compatibilityIdentifiers"].Vector()) for(const auto & compatID : entry["compatibilityIdentifiers"].Vector())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype); {
if (identifier != compatID.String())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype);
else
logMod->warn("Mod '%s' map object '%s': compatibility identifier has same name as object itself!");
}
} }
void CObjectClassesHandler::loadSubObject(const std::string & scope, const std::string & identifier, const JsonNode & entry, ObjectClass * baseObject, size_t index) void CObjectClassesHandler::loadSubObject(const std::string & scope, const std::string & identifier, const JsonNode & entry, ObjectClass * baseObject, size_t index)
@@ -192,7 +197,12 @@ void CObjectClassesHandler::loadSubObject(const std::string & scope, const std::
registerObject(scope, baseObject->getJsonKey(), subObject->getSubTypeName(), subObject->subtype); registerObject(scope, baseObject->getJsonKey(), subObject->getSubTypeName(), subObject->subtype);
for(const auto & compatID : entry["compatibilityIdentifiers"].Vector()) for(const auto & compatID : entry["compatibilityIdentifiers"].Vector())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype); {
if (identifier != compatID.String())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype);
else
logMod->warn("Mod '%s' map object '%s': compatibility identifier has same name as object itself!");
}
} }
TObjectTypeHandler CObjectClassesHandler::loadSubObjectFromJson(const std::string & scope, const std::string & identifier, const JsonNode & entry, ObjectClass * baseObject, size_t index) TObjectTypeHandler CObjectClassesHandler::loadSubObjectFromJson(const std::string & scope, const std::string & identifier, const JsonNode & entry, ObjectClass * baseObject, size_t index)