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

Merge branch 'master' into 'develop'

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-27 21:15:42 +00:00
parent 319d90cbb4 dfda6d2626
commit 8f074490a7
52 changed files with 864 additions and 386 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);
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!", scope, identifier);
}
}
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);
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)