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 remote-tracking branch 'upstream/develop' into adv_search

Browse Source
This commit is contained in:
Laserlicht
2024-10-14 19:52:55 +02:00
parent 129f8e6f34 604e3b5c67
commit 9ed4dbaeb4
352 changed files with 6282 additions and 4731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mapObjectConstructors/CObjectClassesHandler.cpp
View File

@ -207,8 +207,13 @@ TObjectTypeHandler CObjectClassesHandler::loadSubObjectFromJson(const std::strin
// Compatibility with 1.5 mods for 1.6. To be removed in 1.7
// Detect banks that use old format and load them using old bank hander
if (baseObject->id == Obj::CREATURE_BANK && entry.Struct().count("levels") && !entry.Struct().count("rewards"))
handler = "bank";
if (baseObject->id == Obj::CREATURE_BANK)
{
if (entry.Struct().count("levels") && !entry.Struct().count("rewards"))
handler = "bank";
else
handler = "configurable";
}
auto createdObject = handlerConstructors.at(handler)();