From 39c1282d6fe999f7af93bb06735d121f49ddea0d Mon Sep 17 00:00:00 2001 From: goaaats Date: Wed, 23 Jan 2019 21:36:26 +0100 Subject: [PATCH] Spaces --- src/world/Actor/BNpc.cpp | 4 ++-- src/world/Manager/NaviMgr.cpp | 2 +- src/world/ServerMgr.cpp | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index 70250b62..c13f2fe3 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -167,14 +167,14 @@ void Sapphire::Entity::BNpc::step() return; } - auto stepPos = m_naviLastPath[m_naviPathStep]; + auto stepPos = m_naviLastPath[ m_naviPathStep ]; if( Util::distance( getPos().x, getPos().y, getPos().z, stepPos.x, stepPos.y, stepPos.z ) <= 4 && m_naviPathStep < m_naviLastPath.size() - 1 ) { // Reached step in path m_naviPathStep++; - stepPos = m_naviLastPath[m_naviPathStep]; + stepPos = m_naviLastPath[ m_naviPathStep ]; } // This is probably not a good way to do it but works fine for now diff --git a/src/world/Manager/NaviMgr.cpp b/src/world/Manager/NaviMgr.cpp index 9b6f161c..9300aa3f 100644 --- a/src/world/Manager/NaviMgr.cpp +++ b/src/world/Manager/NaviMgr.cpp @@ -23,7 +23,7 @@ bool Sapphire::World::Manager::NaviMgr::setupTerritory( std::string internalName Sapphire::NaviProvider* Sapphire::World::Manager::NaviMgr::getNaviProvider( std::string internalName ) { if( m_naviProviderTerritoryMap.find( internalName ) != m_naviProviderTerritoryMap.end() ) - return m_naviProviderTerritoryMap[internalName]; + return m_naviProviderTerritoryMap[ internalName ]; return nullptr; } diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp index 24624678..be23f8c9 100644 --- a/src/world/ServerMgr.cpp +++ b/src/world/ServerMgr.cpp @@ -347,7 +347,7 @@ bool Sapphire::World::ServerMgr::createSession( uint32_t sessionId ) Logger::info( "[{0}] Creating new session", session_id_str ); std::shared_ptr< Session > newSession( new Session( sessionId, framework() ) ); - m_sessionMapById[sessionId] = newSession; + m_sessionMapById[ sessionId ] = newSession; if( !newSession->loadPlayer() ) { @@ -355,7 +355,7 @@ bool Sapphire::World::ServerMgr::createSession( uint32_t sessionId ) return false; } - m_sessionMapByName[newSession->getPlayer()->getName()] = newSession; + m_sessionMapByName[ newSession->getPlayer()->getName() ] = newSession; return true; @@ -424,7 +424,7 @@ std::string Sapphire::World::ServerMgr::getPlayerNameFromDb( uint32_t playerId, void Sapphire::World::ServerMgr::updatePlayerName( uint32_t playerId, const std::string & playerNewName ) { - m_playerNameMapById[playerId] = playerNewName; + m_playerNameMapById[ playerId ] = playerNewName; } void Sapphire::World::ServerMgr::loadBNpcTemplates() @@ -455,13 +455,13 @@ void Sapphire::World::ServerMgr::loadBNpcTemplates() auto look = res->getBlobVector( 12 ); auto models = res->getBlobVector( 13 ); - auto bnpcTemplate = std::make_shared< Entity::BNpcTemplate >( - id, bNPCBaseId, bNPCNameId, mainWeaponModel, secWeaponModel, - aggressionMode, enemyType, 0, pose, modelChara, displayFlags, - reinterpret_cast( &models[0] ), - reinterpret_cast( &look[0] ) ); + auto bnpcTemplate = std::make_shared< Entity::BNpcTemplate >( + id, bNPCBaseId, bNPCNameId, mainWeaponModel, secWeaponModel, + aggressionMode, enemyType, 0, pose, modelChara, displayFlags, + reinterpret_cast< uint32_t* >( &models[ 0 ] ), + reinterpret_cast< uint8_t* >( &look[ 0 ] ) ); - m_bNpcTemplateMap[name] = bnpcTemplate; + m_bNpcTemplateMap[ name ] = bnpcTemplate; } Logger::debug( "BNpc Templates loaded: {0}", m_bNpcTemplateMap.size() );