From 055a6655161949d5c1a5d2f370dc400b47e9a828 Mon Sep 17 00:00:00 2001 From: goaaats Date: Tue, 19 Dec 2017 16:29:22 +0100 Subject: [PATCH] fix build --- .../Server_Zone/DebugCommand/DebugCommandHandler.cpp | 12 ++++++------ .../Network/Handlers/GMCommandHandlers.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp index 08c494be..4a37137b 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp @@ -126,12 +126,12 @@ void Core::DebugCommandHandler::scriptReload( char * data, Entity::Player& playe void Core::DebugCommandHandler::help( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command ) { - pPlayer->sendDebug( "Registered debug commands:" ); + player.sendDebug( "Registered debug commands:" ); for( auto cmd : m_commandMap ) { - if( pPlayer->getGmRank() >= cmd.second->m_gmLevel ) + if( player.getGmRank() >= cmd.second->m_gmLevel ) { - pPlayer->sendDebug( " - " + cmd.first + " - " + cmd.second->getHelpText() ); + player.sendDebug( " - " + cmd.first + " - " + cmd.second->getHelpText() ); } } @@ -403,11 +403,11 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost: int32_t id; sscanf( params.c_str(), "%d", &id ); - pPlayer->learnAction( id ); + player.learnAction( id ); } else if( subCommand == "enablecompanion" ) { - pPlayer->learnAction( 17 ); + player.learnAction( 17 ); } else { @@ -531,5 +531,5 @@ void Core::DebugCommandHandler::serverInfo( char * data, Entity::Player& player, void Core::DebugCommandHandler::unlockCharacter( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command ) { - pPlayer->unlock(); + player.unlock(); } diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp index 1c1211b9..0f2380fd 100644 --- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp @@ -190,8 +190,8 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac } case GmCommand::Call: { - if( targetPlayer->getZoneId() != pPlayer->getZoneId() ) - targetPlayer->setZone( pPlayer->getZoneId() ); + if( targetPlayer->getZoneId() != player.getZoneId() ) + targetPlayer->setZone( player.getZoneId() ); targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRotation() ); @@ -307,13 +307,13 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac for( uint8_t i = 0; i < 255; i++ ) targetActor->getAsPlayer()->learnMount( i ); - pPlayer->sendNotice( "All mounts for " + targetPlayer->getName() + + player.sendNotice( "All mounts for " + targetPlayer->getName() + " were turned on." ); } else { targetActor->getAsPlayer()->learnMount( param1 ); - pPlayer->sendNotice( "Mount " + std::to_string( param1 ) + " for " + targetPlayer->getName() + + player.sendNotice( "Mount " + std::to_string( param1 ) + " for " + targetPlayer->getName() + " was turned on." ); } @@ -433,7 +433,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac targetPlayer->setPosition( targetPlayer->getPos() ); targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 ); - pPlayer->sendNotice( targetPlayer->getName() + " was warped to zone " + std::to_string( param1 ) + " (" + zoneInfo->getName() + ")" ); + player.sendNotice( targetPlayer->getName() + " was warped to zone " + std::to_string( param1 ) + " (" + zoneInfo->getName() + ")" ); } break; }