From fda2353e7875780ec84e46b8c988c826e59f8e7d Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 11 Jan 2022 14:42:45 +0100 Subject: [PATCH] Small type conversion warnings fixed --- src/world/Actor/Player.cpp | 2 +- src/world/Actor/Player.h | 2 +- src/world/Manager/EventMgr.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index 3310647a..c8738f5f 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -1456,7 +1456,7 @@ void Sapphire::Entity::Player::setCompanion( uint16_t id ) sendToInRangeSet( makeActorControl( getId(), ActorControlType::ToggleCompanion, id ), true ); } -uint16_t Sapphire::Entity::Player::getCurrentCompanion() const +uint8_t Sapphire::Entity::Player::getCurrentCompanion() const { return m_companionId; } diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h index 7155fca4..06550192 100644 --- a/src/world/Actor/Player.h +++ b/src/world/Actor/Player.h @@ -407,7 +407,7 @@ namespace Sapphire::Entity void setCompanion( uint16_t id ); - uint16_t getCurrentCompanion() const; + uint8_t getCurrentCompanion() const; /*! get the current setMount */ uint8_t getCurrentMount() const; diff --git a/src/world/Manager/EventMgr.cpp b/src/world/Manager/EventMgr.cpp index c7bc69b7..2afd9eb8 100644 --- a/src/world/Manager/EventMgr.cpp +++ b/src/world/Manager/EventMgr.cpp @@ -591,7 +591,7 @@ void EventMgr::resumeScene( Entity::Player& player, uint32_t eventId, uint32_t s auto resumeEvent = makeZonePacket< FFXIVIpcResumeEventScene2 >( player.getId() ); resumeEvent->data().handlerId = eventId; resumeEvent->data().sceneId = static_cast< uint8_t >( scene ); - resumeEvent->data().numOfArgs = values.size(); + resumeEvent->data().numOfArgs = static_cast< uint8_t >( values.size() ); int i = 0; for( auto& val : values ) {