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

Merge remote-tracking branch 'origin/develop' into custom_objects_per_zone

Browse Source 
# Conflicts:
#	lib/rmg/CRmgTemplate.cpp
This commit is contained in:
Tomasz Zieliński
2024-09-14 10:19:22 +02:00
parent 4d4538a48d 1e74216040
commit 2fe54504ab
717 changed files with 28274 additions and 13108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjectConstructors/CObjectClassesHandler.h
View File

@ -34,7 +34,7 @@ public:
std::string handlerName; // ID of handler that controls this object, should be determined using handlerConstructor map
JsonNode base;
std::vector<TObjectTypeHandler> objects;
std::vector<TObjectTypeHandler> objectTypeHandlers;
ObjectClass();
~ObjectClass();
@ -48,7 +48,7 @@ public:
class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase, boost::noncopyable
{
/// list of object handlers, each of them handles only one type
std::vector< std::unique_ptr<ObjectClass> > objects;
std::vector< std::unique_ptr<ObjectClass> > mapObjectTypes;
/// map that is filled during construction with all known handlers. Not serializeable due to usage of std::function
std::map<std::string, std::function<TObjectTypeHandler()> > handlerConstructors;