From 0583459ed2718d458a320d50b03c174bb6a4ca9f Mon Sep 17 00:00:00 2001 From: NotAdam Date: Thu, 23 Aug 2018 23:19:25 +1000 Subject: [PATCH] fix some compile warnings --- src/common/Network/GamePacketNew.h | 2 +- src/servers/sapphire_zone/Actor/Player.h | 2 +- src/servers/sapphire_zone/Actor/PlayerQuest.cpp | 4 ++-- src/servers/sapphire_zone/Network/GameConnection.cpp | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/Network/GamePacketNew.h b/src/common/Network/GamePacketNew.h index aae33508..473b6e12 100644 --- a/src/common/Network/GamePacketNew.h +++ b/src/common/Network/GamePacketNew.h @@ -219,7 +219,7 @@ public: return data; } - virtual T1 ipcType() + T1 ipcType() override { return static_cast< T1 >( m_data._ServerIpcType ); }; diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h index 5376b655..0d3393a3 100644 --- a/src/servers/sapphire_zone/Actor/Player.h +++ b/src/servers/sapphire_zone/Actor/Player.h @@ -131,7 +131,7 @@ public: /*! update quest ( register it as active quest if new ) */ void updateQuest( uint16_t questId, uint8_t sequence ); /*! return true if quest is currently active */ - bool hasQuest( uint16_t questId ); + bool hasQuest( uint32_t questId ); /*! return the current quest sequence */ uint8_t getQuestSeq( uint16_t questId ); /*! send the quest tracker packet */ diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp index 7cdfaed4..c76f0168 100644 --- a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp +++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp @@ -72,9 +72,9 @@ void Core::Entity::Player::removeQuest( uint16_t questId ) } -bool Core::Entity::Player::hasQuest( uint16_t questId ) +bool Core::Entity::Player::hasQuest( uint32_t questId ) { - return ( getQuestIndex( questId ) > -1 ); + return ( getQuestIndex( static_cast< uint16_t>( questId ) ) > -1 ); } int8_t Core::Entity::Player::getQuestIndex( uint16_t questId ) diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp index fc68c282..d93953b3 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.cpp +++ b/src/servers/sapphire_zone/Network/GameConnection.cpp @@ -259,6 +259,9 @@ void Core::Network::GameConnection::handlePacket( Core::Network::Packets::FFXIVA case Network::ConnectionType::Chat: handleChatPacket( pPacket ); break; + + default: + break; } }