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

make mordred happy

Browse source
This commit is contained in:
Adam 2018-03-06 18:00:57 +11:00
parent df4ee95cf5
commit 32e10ec6e8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,7 +115,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
if( m_instanceCommenceTime == 0 ) if( m_instanceCommenceTime == 0 )
{ {
m_instanceCommenceTime = Util::getTimeMs() + INSTANCE_COMMENCE_DELAY; m_instanceCommenceTime = Util::getTimeMs() + instanceStartDelay;
return; return;
} }
else if( Util::getTimeMs() < m_instanceCommenceTime ) else if( Util::getTimeMs() < m_instanceCommenceTime )
@ -129,7 +129,8 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
getDirectorId(), 0x40000001, m_instanceContentInfo->timeLimitmin * 60u ) ); getDirectorId(), 0x40000001, m_instanceContentInfo->timeLimitmin * 60u ) );
} }
m_pEntranceEObj->setState( 7 ); if( m_pEntranceEObj )
m_pEntranceEObj->setState( 7 );
m_state = DutyInProgress; m_state = DutyInProgress;
m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceContentInfo->timeLimitmin * 60u ); m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceContentInfo->timeLimitmin * 60u );
break; break;

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

@ -22,9 +22,6 @@ public:
DutyFinished DutyFinished
}; };
/*! number of milliseconds after all players are ready for the instance to commence (spawn circle removed) */
const uint32_t INSTANCE_COMMENCE_DELAY = 1250;
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,
@ -55,6 +52,8 @@ public:
Entity::EventObjectPtr getEObjByName( const std::string& name ); Entity::EventObjectPtr getEObjByName( const std::string& name );
/*! number of milliseconds after all players are ready for the instance to commence (spawn circle removed) */
const uint32_t instanceStartDelay = 1250;
private: private:
Event::DirectorPtr m_pDirector; Event::DirectorPtr m_pDirector;
boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo; boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;