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 generation of additional monolith types for RMG

Browse Source
This commit is contained in:
Ivan Savenko
2023-11-21 18:32:07 +02:00
parent d0e320723c
commit e96cde291a
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mapObjectConstructors/CObjectClassesHandler.cpp
View File

@ -36,6 +36,7 @@
#include "../mapObjects/CGTownInstance.h" #include "../mapObjects/CGTownInstance.h"
#include "../modding/IdentifierStorage.h" #include "../modding/IdentifierStorage.h"
#include "../modding/CModHandler.h" #include "../modding/CModHandler.h"
#include "../modding/ModScope.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN
@ -267,6 +268,10 @@ ObjectClass * CObjectClassesHandler::loadFromJson(const std::string & scope, con
else else
loadSubObject(subData.second.meta, subData.first, subData.second, obj); loadSubObject(subData.second.meta, subData.first, subData.second, obj);
} }
if (obj->id == MapObjectID::MONOLITH_TWO_WAY)
generateExtraMonolithsForRMG(obj);
return obj; return obj;
} }
@ -413,14 +418,12 @@ void CObjectClassesHandler::afterLoadFinalization()
logGlobal->warn("No templates found for %s:%s", entry->getJsonKey(), obj->getJsonKey()); logGlobal->warn("No templates found for %s:%s", entry->getJsonKey(), obj->getJsonKey());
} }
} }
generateExtraMonolithsForRMG();
} }
void CObjectClassesHandler::generateExtraMonolithsForRMG() void CObjectClassesHandler::generateExtraMonolithsForRMG(ObjectClass * container)
{ {
//duplicate existing two-way portals to make reserve for RMG //duplicate existing two-way portals to make reserve for RMG
auto& portalVec = objects[Obj::MONOLITH_TWO_WAY]->objects; auto& portalVec = container->objects;
//FIXME: Monoliths in this vector can be already not useful for every terrain //FIXME: Monoliths in this vector can be already not useful for every terrain
const size_t portalCount = portalVec.size(); const size_t portalCount = portalVec.size();
@ -449,7 +452,10 @@ void CObjectClassesHandler::generateExtraMonolithsForRMG()
newPortal->type = portal->getIndex(); newPortal->type = portal->getIndex();
newPortal->subtype = portalVec.size(); //indexes must be unique, they are returned as a set newPortal->subtype = portalVec.size(); //indexes must be unique, they are returned as a set
portalVec.push_back(newPortal); portalVec.push_back(newPortal);
registerObject(ModScope::scopeGame(), container->getJsonKey(), newPortal->subTypeName, newPortal->subtype);
} }
} }

2
lib/mapObjectConstructors/CObjectClassesHandler.h
View File

@ -84,7 +84,7 @@ class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase
ObjectClass * loadFromJson(const std::string & scope, const JsonNode & json, const std::string & name, size_t index); ObjectClass * loadFromJson(const std::string & scope, const JsonNode & json, const std::string & name, size_t index);
void generateExtraMonolithsForRMG(); void generateExtraMonolithsForRMG(ObjectClass * container);
public: public:
CObjectClassesHandler(); CObjectClassesHandler();