diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp index a4d72600..0512eecb 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp +++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp @@ -3,11 +3,12 @@ Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent, uint32_t guId, const std::string& internalName, - const std::string& placeName, - const uint32_t instanceContentId ) - : Zone( pInstanceContent->territoryType, guId, internalName, placeName ), - m_instanceContentRow( pInstanceContent ), - m_instanceContentId( instanceContentId ) + const std::string& contentName, + uint32_t instanceContentId ) + : Zone( pInstanceContent->territoryType, guId, internalName, contentName ), + m_instanceContentInfo( pInstanceContent ), + m_instanceContentId( instanceContentId ), + m_state( Created ) { } @@ -15,4 +16,14 @@ Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceC Core::InstanceContent::~InstanceContent() { -} \ No newline at end of file +} + +uint32_t Core::InstanceContent::getInstanceContentId() const +{ + return m_instanceContentId; +} + +boost::shared_ptr< Core::Data::InstanceContent > Core::InstanceContent::getInstanceContentInfo() const +{ + return m_instanceContentInfo; +} diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h index 1478eb7b..da52f5e0 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.h +++ b/src/servers/sapphire_zone/Zone/InstanceContent.h @@ -21,24 +21,19 @@ public: InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent, uint32_t guId, const std::string& internalName, - const std::string& placeName, - const uint32_t instanceContentId ); + const std::string& contentName, + uint32_t instanceContentId ); virtual ~InstanceContent(); - boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentRow() const - { - return m_instanceContentRow; - } + boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const; - const uint32_t getInstanceContentId() - { - return m_instanceContentId; - } + uint32_t getInstanceContentId() const; private: Event::DirectorPtr m_pDirector; - boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentRow; + boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo; uint32_t m_instanceContentId; + InstanceContentState m_state; };