mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 00:27:44 +00:00
Code Activity

formatting

Browse source
This commit is contained in:
Mordred 2018-03-05 14:34:34 +01:00 • committed by GitHub
parent 33429a0284
commit 38f018240d
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInsta
return m_instanceContentInfo; return m_instanceContentInfo;
} }
void Core::InstanceContent::onPlayerZoneIn( Entity::Player &player ) void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
{ {
g_log.debug( "InstanceContent::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|" g_log.debug( "InstanceContent::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|"
+ std::to_string( getInstanceContentId() ) + + std::to_string( getInstanceContentId() ) +
@ -102,7 +102,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
if( m_playerMap.size() < 1 ) if( m_playerMap.size() < 1 )
return; return;
for( const auto &playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
if( !playerIt.second->isLoadingComplete() || if( !playerIt.second->isLoadingComplete() ||
!playerIt.second->isDirectorInitialized() || !playerIt.second->isDirectorInitialized() ||
@ -110,7 +110,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
return; return;
} }
for( const auto &playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
auto pPlayer = playerIt.second; auto pPlayer = playerIt.second;
pPlayer->queuePacket( pPlayer->queuePacket(
@ -222,7 +222,7 @@ void Core::InstanceContent::setVar( uint8_t index, uint8_t value )
} }
// todo: genericise this? // todo: genericise this?
for( const auto &playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
sendDirectorVars( *playerIt.second ); sendDirectorVars( *playerIt.second );
} }
@ -232,7 +232,7 @@ void Core::InstanceContent::setSequence( uint8_t value )
{ {
setDirectorSequence( value ); setDirectorSequence( value );
for( const auto &playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
sendDirectorVars( *playerIt.second ); sendDirectorVars( *playerIt.second );
} }
@ -242,7 +242,7 @@ void Core::InstanceContent::setBranch( uint8_t value )
{ {
setDirectorBranch( value ); setDirectorBranch( value );
for( const auto &playerIt : m_playerMap ) for( const auto& playerIt : m_playerMap )
{ {
sendDirectorVars( *playerIt.second ); sendDirectorVars( *playerIt.second );
} }
@ -263,7 +263,7 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
g_log.error( "InstanceContent::onRegisterEObj Zone " + m_internalName + ": No EObj data found for EObj with ID: " + std::to_string( object->getObjectId() ) ); g_log.error( "InstanceContent::onRegisterEObj Zone " + m_internalName + ": No EObj data found for EObj with ID: " + std::to_string( object->getObjectId() ) );
} }
void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player &player ) void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player )
{ {
if( m_pEntranceEObj != nullptr ) if( m_pEntranceEObj != nullptr )
{ {
@ -279,7 +279,7 @@ void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player &player )
player.resetObjSpawnIndex( ); player.resetObjSpawnIndex( );
} }
Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string &name ) Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string& name )
{ {
auto it = m_eventObjectMap.find( name ); auto it = m_eventObjectMap.find( name );
if( it == m_eventObjectMap.end() ) if( it == m_eventObjectMap.end() )