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

I love me some style and wording fixes

Browse source
This commit is contained in:
Biscuit Boy 2018-04-19 22:34:45 +10:00
parent 10eec1f954
commit 168cc7409b
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/servers/sapphire_zone/Actor/Player.cpp
View file

@ -1600,18 +1600,18 @@ void Core::Entity::Player::sendTitleList()
queuePacket( titleListPacket ); 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 zoneInPacket = ActorControlPacket143( getId(), ZoneIn, param1, param2, param3, param4 );
auto SetStatusPacket = ActorControlPacket142( getId(), SetStatus, static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ); auto SetStatusPacket = ActorControlPacket142( getId(), SetStatus, static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) );
if( getGmInvis() ) if( getGmInvis() )
sendToInRangeSet( zoneInPacket, true ); sendToInRangeSet( zoneInPacket, true );
if( pSetStatus ) if( shouldSetStatus )
sendToInRangeSet( SetStatusPacket ); sendToInRangeSet( SetStatusPacket );
else else
queuePacket( zoneInPacket ); queuePacket( zoneInPacket );
if (pSetStatus) if ( shouldSetStatus )
queuePacket( SetStatusPacket ); queuePacket( SetStatusPacket );
setZoningType( Common::ZoneingType::None ); setZoningType( Common::ZoneingType::None );
@ -1638,10 +1638,7 @@ void Core::Entity::Player::finishZoning()
resetHp(); resetHp();
resetMp(); resetMp();
setStatus( Entity::Chara::ActorStatus::Idle ); setStatus( Entity::Chara::ActorStatus::Idle );
sendZoneInPackets( 0x01, 0x01, 0, 111, true ); sendZoneInPackets( 0x01, 0x01, 0, 111, true );
sendToInRangeSet( ActorControlPacket142( getId(), SetStatus,
static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ), true );
} }
else else
sendZoneInPackets( 0x01, 0x00, 0, 111 ); sendZoneInPackets( 0x01, 0x00, 0, 111 );