From 34f7d29ecd4fca827b1cdf3220e4993cf57b3636 Mon Sep 17 00:00:00 2001 From: collett Date: Wed, 1 Jul 2020 07:28:25 +0900 Subject: [PATCH] player.forceZoneing expand --- src/world/Actor/Player.cpp | 7 ++++--- src/world/Actor/Player.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 77434e14..5eefff94 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -409,10 +409,11 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type ) } -void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId ) +void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId, float x, float y, float z, float r, bool showZoneName ) { - m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, getPos(), Util::getTimeMs(), 0.f ); - //performZoning( zoneId, Common::ZoneingType::None, getPos() ); + Common::FFXIVARR_POSITION3 pos { x, y, z }; + m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, pos, Util::getTimeMs(), r ); + prepareZoning( showZoneName ? zoneId : 0, true, 1, 0 ); } void Sapphire::Entity::Player::returnToHomepoint() diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h index 162b55eb..de0452b7 100644 --- a/src/world/Actor/Player.h +++ b/src/world/Actor/Player.h @@ -501,7 +501,7 @@ namespace Sapphire::Entity /*! gets the players territoryTypeId */ uint32_t getTerritoryTypeId() const; - void forceZoneing( uint32_t zoneId ); + void forceZoneing( uint32_t zoneId, float x = 0, float y = 0, float z = 0, float r = 0, bool showZoneName = false ); /*! return player to preset homepoint */ void returnToHomepoint();