mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-21 00:19:29 +02:00
Fix build
This commit is contained in:
@ -221,6 +221,9 @@ TObjectTypeHandler CObjectClassesHandler::loadSubObjectFromJson(const std::strin
|
|||||||
return createdObject;
|
return createdObject;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ObjectClass::ObjectClass() = default;
|
||||||
|
ObjectClass::~ObjectClass() = default;
|
||||||
|
|
||||||
std::string ObjectClass::getJsonKey() const
|
std::string ObjectClass::getJsonKey() const
|
||||||
{
|
{
|
||||||
return modScope + ':' + identifier;
|
return modScope + ':' + identifier;
|
||||||
|
@ -45,7 +45,7 @@ class CGObjectInstance;
|
|||||||
using TObjectTypeHandler = std::shared_ptr<AObjectTypeHandler>;
|
using TObjectTypeHandler = std::shared_ptr<AObjectTypeHandler>;
|
||||||
|
|
||||||
/// Class responsible for creation of adventure map objects of specific type
|
/// Class responsible for creation of adventure map objects of specific type
|
||||||
class DLL_LINKAGE ObjectClass
|
class DLL_LINKAGE ObjectClass : boost::noncopyable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
std::string modScope;
|
std::string modScope;
|
||||||
@ -57,7 +57,8 @@ public:
|
|||||||
JsonNode base;
|
JsonNode base;
|
||||||
std::vector<TObjectTypeHandler> objects;
|
std::vector<TObjectTypeHandler> objects;
|
||||||
|
|
||||||
ObjectClass() = default;
|
ObjectClass();
|
||||||
|
~ObjectClass();
|
||||||
|
|
||||||
std::string getJsonKey() const;
|
std::string getJsonKey() const;
|
||||||
std::string getNameTextID() const;
|
std::string getNameTextID() const;
|
||||||
@ -65,7 +66,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
/// Main class responsible for creation of all adventure map objects
|
/// Main class responsible for creation of all adventure map objects
|
||||||
class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase
|
class DLL_LINKAGE CObjectClassesHandler : public IHandlerBase, boost::noncopyable
|
||||||
{
|
{
|
||||||
/// list of object handlers, each of them handles only one type
|
/// list of object handlers, each of them handles only one type
|
||||||
std::vector< std::unique_ptr<ObjectClass> > objects;
|
std::vector< std::unique_ptr<ObjectClass> > objects;
|
||||||
|
Reference in New Issue
Block a user