games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fix map object appearance serialization

Browse Source
This commit is contained in:
AlexVinS
2016-02-26 02:03:14 +03:00
parent 0de1a37d65
commit 8e3e574900
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapObjects/CObjectClassesHandler.h
View File

@@ -101,12 +101,6 @@ class DLL_LINKAGE AObjectTypeHandler : public boost::noncopyable
/// Human-readable name of this object, used for objects like banks and dwellings, if set
boost::optional<std::string> objectName;
si32 type;
si32 subtype;
std::string typeName;
std::string subTypeName;
JsonNode base; /// describes base template
std::vector<ObjectTemplate> templates;
@@ -117,6 +111,12 @@ protected:
/// initialization for classes that inherit this one
virtual void initTypeData(const JsonNode & input);
public:
std::string typeName;
std::string subTypeName;
si32 type;
si32 subtype;
virtual ~AObjectTypeHandler(){}
void setType(si32 type, si32 subtype);