mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 07:07:45 +00:00
Code Activity

Minor cleanup of InstanceContent class

Browse source
This commit is contained in:
Mordred 2018-01-29 19:41:41 +01:00
parent 88f8eb2cb5
commit 8afe739aaf
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/servers/sapphire_zone/Zone/InstanceContent.cpp
View file

@ -3,11 +3,12 @@
Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent, Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent,
uint32_t guId, uint32_t guId,
const std::string& internalName, const std::string& internalName,
const std::string& placeName, const std::string& contentName,
const uint32_t instanceContentId ) uint32_t instanceContentId )
: Zone( pInstanceContent->territoryType, guId, internalName, placeName ), : Zone( pInstanceContent->territoryType, guId, internalName, contentName ),
m_instanceContentRow( pInstanceContent ), m_instanceContentInfo( pInstanceContent ),
m_instanceContentId( instanceContentId ) m_instanceContentId( instanceContentId ),
m_state( Created )
{ {
} }
@ -16,3 +17,13 @@ Core::InstanceContent::~InstanceContent()
{ {
} }
uint32_t Core::InstanceContent::getInstanceContentId() const
{
return m_instanceContentId;
}
boost::shared_ptr< Core::Data::InstanceContent > Core::InstanceContent::getInstanceContentInfo() const
{
return m_instanceContentInfo;
}

17
src/servers/sapphire_zone/Zone/InstanceContent.h
View file

@ -21,24 +21,19 @@ public:
InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent, InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent,
uint32_t guId, uint32_t guId,
const std::string& internalName, const std::string& internalName,
const std::string& placeName, const std::string& contentName,
const uint32_t instanceContentId ); uint32_t instanceContentId );
virtual ~InstanceContent(); virtual ~InstanceContent();
boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentRow() const boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const;
{
return m_instanceContentRow;
}
const uint32_t getInstanceContentId() uint32_t getInstanceContentId() const;
{
return m_instanceContentId;
}
private: private:
Event::DirectorPtr m_pDirector; Event::DirectorPtr m_pDirector;
boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentRow; boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;
uint32_t m_instanceContentId; uint32_t m_instanceContentId;
InstanceContentState m_state;
}; };