From 168cc7409ba5e667d4be638ef09d9ddfe3d9f2ca Mon Sep 17 00:00:00 2001 From: Biscuit Boy Date: Thu, 19 Apr 2018 22:34:45 +1000 Subject: [PATCH] I love me some style and wording fixes --- src/servers/sapphire_zone/Actor/Player.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp index b09f3fea..0abbb673 100644 --- a/src/servers/sapphire_zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -1600,18 +1600,18 @@ void Core::Entity::Player::sendTitleList() queuePacket( titleListPacket ); } -void Core::Entity::Player::sendZoneInPackets( uint32_t param1, uint32_t param2 = 0, uint32_t param3 = 0, uint32_t param4 = 0, bool pSetStatus = false ) +void Core::Entity::Player::sendZoneInPackets( uint32_t param1, uint32_t param2 = 0, uint32_t param3 = 0, uint32_t param4 = 0, bool shouldSetStatus = false ) { auto zoneInPacket = ActorControlPacket143( getId(), ZoneIn, param1, param2, param3, param4 ); auto SetStatusPacket = ActorControlPacket142( getId(), SetStatus, static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ); if( getGmInvis() ) sendToInRangeSet( zoneInPacket, true ); - if( pSetStatus ) + if( shouldSetStatus ) sendToInRangeSet( SetStatusPacket ); else queuePacket( zoneInPacket ); - if (pSetStatus) + if ( shouldSetStatus ) queuePacket( SetStatusPacket ); setZoningType( Common::ZoneingType::None ); @@ -1638,10 +1638,7 @@ void Core::Entity::Player::finishZoning() resetHp(); resetMp(); setStatus( Entity::Chara::ActorStatus::Idle ); - sendZoneInPackets( 0x01, 0x01, 0, 111, true ); - sendToInRangeSet( ActorControlPacket142( getId(), SetStatus, - static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ), true ); } else sendZoneInPackets( 0x01, 0x00, 0, 111 );