From 638b84d31de73178a200e2707f64991067d9e6db Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 14 Oct 2018 19:20:06 +1100 Subject: [PATCH 1/2] fix some compiler warnings --- src/common/Database/DbConnection.cpp | 2 +- src/servers/sapphire_zone/Actor/BNpc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp index 3eb7a4d5..7a27717c 100644 --- a/src/common/Database/DbConnection.cpp +++ b/src/common/Database/DbConnection.cpp @@ -207,7 +207,7 @@ boost::shared_ptr< Mysql::PreparedStatement > Core::Db::DbConnection::getPrepare assert( index < m_stmts.size() ); auto ret = m_stmts[ index ]; if( !ret ) - nullptr; + return nullptr; return ret; } diff --git a/src/servers/sapphire_zone/Actor/BNpc.h b/src/servers/sapphire_zone/Actor/BNpc.h index b5ef8bcd..c1679887 100644 --- a/src/servers/sapphire_zone/Actor/BNpc.h +++ b/src/servers/sapphire_zone/Actor/BNpc.h @@ -31,7 +31,7 @@ public: void spawn( PlayerPtr pTarget ) override; uint16_t getModelChara() const; - uint8_t getLevel() const; + uint8_t getLevel() const override; uint32_t getBNpcBaseId() const; uint32_t getBNpcNameId() const; From dbbd6bb530bdb19952a1d86e6365dd3616ecce3a Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 14 Oct 2018 23:31:52 +1100 Subject: [PATCH 2/2] cleanup unnecessary refs --- .../Network/Handlers/ActionHandler.cpp | 8 ++--- .../Network/Handlers/ClientTriggerHandler.cpp | 12 +++---- .../Network/Handlers/EventHandlers.cpp | 36 +++++++++---------- .../Network/Handlers/GMCommandHandlers.cpp | 12 +++---- .../Network/Handlers/InventoryHandler.cpp | 12 +++---- .../Network/Handlers/PacketHandlers.cpp | 12 +++---- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp index ed82ae61..fd7bb69f 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp @@ -41,10 +41,10 @@ void Core::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKE { const auto packet = ZoneChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket ); - const auto& type = packet.data().type; - const auto& action = packet.data().actionId; - const auto& useCount = packet.data().useCount; - const auto& targetId = packet.data().targetId; + const auto type = packet.data().type; + const auto action = packet.data().actionId; + const auto useCount = packet.data().useCount; + const auto targetId = packet.data().targetId; player.sendDebug( "Skill type:" + std::to_string( type ) ); diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp index 374a6d64..b2d6a7f9 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp @@ -65,12 +65,12 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR const auto packet = ZoneChannelPacket< Client::FFXIVIpcClientTrigger >( inPacket ); - const auto& commandId = packet.data().commandId; - const auto& param1 = *reinterpret_cast< const uint64_t* >( &packet.data().param11 ); - const auto& param11 = packet.data().param11; - const auto& param12 = packet.data().param12; - const auto& param2 = packet.data().param2; - const auto& param3 = packet.data().param3; + const auto commandId = packet.data().commandId; + const auto param1 = *reinterpret_cast< const uint64_t* >( &packet.data().param11 ); + const auto param11 = packet.data().param11; + const auto param12 = packet.data().param12; + const auto param2 = packet.data().param2; + const auto param3 = packet.data().param3; pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Incoming action: " + boost::str( boost::format( "%|04X|" ) % ( uint32_t ) ( commandId & 0xFFFF ) ) + diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp index 9298a673..2700cf49 100644 --- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp @@ -39,8 +39,8 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::FFXIVARR_PA const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerTalk >( inPacket ); - const auto& actorId = packet.data().actorId; - const auto& eventId = packet.data().eventId; + const auto actorId = packet.data().actorId; + const auto eventId = packet.data().eventId; auto eventType = static_cast< uint16_t >( eventId >> 16 ); @@ -84,9 +84,9 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::FFXIVARR_P const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerEmote >( inPacket ); - const auto& actorId = packet.data().actorId; - const auto& eventId = packet.data().eventId; - const auto& emoteId = packet.data().emoteId; + const auto actorId = packet.data().actorId; + const auto eventId = packet.data().eventId; + const auto emoteId = packet.data().emoteId; const auto eventType = static_cast< uint16_t >( eventId >> 16 ); std::string eventName = "onEmote"; @@ -122,8 +122,8 @@ void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::FFXI const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerWithinRange >( inPacket ); - const auto& eventId = packet.data().eventId; - const auto& param1 = packet.data().param1; + const auto eventId = packet.data().eventId; + const auto param1 = packet.data().param1; const auto& pos = packet.data().position; std::string eventName = "onWithinRange"; @@ -144,8 +144,8 @@ void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::FFX auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >(); const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerOutsideRange >( inPacket ); - const auto& eventId = packet.data().eventId; - const auto& param1 = packet.data().param1; + const auto eventId = packet.data().eventId; + const auto param1 = packet.data().param1; const auto& pos = packet.data().position; std::string eventName = "onOutsideRange"; @@ -167,9 +167,9 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::F const auto packet = ZoneChannelPacket< Client::FFXIVIpcEnterTerritoryHandler >( inPacket ); - const auto& eventId = packet.data().eventId; - const auto& param1 = packet.data().param1; - const auto& param2 = packet.data().param2; + const auto eventId = packet.data().eventId; + const auto param1 = packet.data().param1; + const auto param2 = packet.data().param2; std::string eventName = "onEnterTerritory"; @@ -195,12 +195,12 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_ Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcEventHandlerReturn >( inPacket ); - const auto& eventId = packet.data().eventId; - const auto& scene = packet.data().scene; - const auto& param1 = packet.data().param1; - const auto& param2 = packet.data().param2; - const auto& param3 = packet.data().param3; - const auto& param4 = packet.data().param4; + const auto eventId = packet.data().eventId; + const auto scene = packet.data().scene; + const auto param1 = packet.data().param1; + const auto param2 = packet.data().param2; + const auto param3 = packet.data().param3; + const auto param4 = packet.data().param4; std::string eventName = Event::getEventName( eventId ); diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 7a9a23f3..e56b943d 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -94,10 +94,10 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R return; const auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand1 >( inPacket ); - const auto& commandId = packet.data().commandId; - const auto& param1 = packet.data().param1; - const auto& param2 = packet.data().param2; - const auto& param3 = packet.data().param3; + const auto commandId = packet.data().commandId; + const auto param1 = packet.data().param1; + const auto param2 = packet.data().param2; + const auto param3 = packet.data().param3; auto pLog = g_fw.get< Logger >(); pLog->debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) + @@ -505,8 +505,8 @@ void Core::Network::GameConnection::gm2Handler( const Packets::FFXIVARR_PACKET_R const auto packet = ZoneChannelPacket< Client::FFXIVIpcGmCommand2 >( inPacket ); - const auto& commandId = packet.data().commandId; - const auto& param1 = std::string( packet.data().param1 ); + const auto commandId = packet.data().commandId; + const auto param1 = std::string( packet.data().param1 ); pLog->debug( player.getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 ); diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp index 67ce0127..68018fe2 100644 --- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp @@ -32,13 +32,13 @@ void Core::Network::GameConnection::inventoryModifyHandler( const Packets::FFXIV { const auto packet = ZoneChannelPacket< Client::FFXIVIpcInventoryModifyHandler >( inPacket ); - const auto& action = packet.data().action; - const auto& splitCount = packet.data().splitCount; + const auto action = packet.data().action; + const auto splitCount = packet.data().splitCount; - const auto& fromSlot = packet.data().fromSlot; - const auto& fromContainer = packet.data().fromContainer; - const auto& toSlot = packet.data().toSlot; - const auto& toContainer = packet.data().toContainer; + const auto fromSlot = packet.data().fromSlot; + const auto fromContainer = packet.data().fromContainer; + const auto toSlot = packet.data().toSlot; + const auto toContainer = packet.data().toContainer; auto ackPacket = makeZonePacket< Server::FFXIVIpcInventoryActionAck >( player.getId() ); ackPacket->data().sequence = packet.data().seq; diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index 798e3d9a..c6756bde 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -65,10 +65,10 @@ void Core::Network::GameConnection::setSearchInfoHandler( const Packets::FFXIVAR { const auto packet = ZoneChannelPacket< Client::FFXIVIpcSetSearchInfo >( inPacket ); - const auto& inval = packet.data().status1; - const auto& inval1 = packet.data().status2; - const auto& status = packet.data().status; - const auto& selectRegion = packet.data().language; + const auto inval = packet.data().status1; + const auto inval1 = packet.data().status2; + const auto status = packet.data().status; + const auto selectRegion = packet.data().language; player.setSearchInfo( selectRegion, 0, packet.data().searchComment ); @@ -311,7 +311,7 @@ void Core::Network::GameConnection::zoneLineHandler( const Core::Network::Packet auto pTeriMgr = g_fw.get< TerritoryMgr >(); const auto packet = ZoneChannelPacket< Client::FFXIVIpcZoneLineHandler >( inPacket ); - const auto& zoneLineId = packet.data().zoneLineId; + const auto zoneLineId = packet.data().zoneLineId; player.sendDebug( "Walking ZoneLine " + std::to_string( zoneLineId ) ); @@ -355,7 +355,7 @@ void Core::Network::GameConnection::discoveryHandler( const Core::Network::Packe Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcDiscoveryHandler >( inPacket ); - const auto& positionRef = packet.data().positionRef; + const auto positionRef = packet.data().positionRef; auto pDb = g_fw.get< Db::DbWorkerPool< Db::ZoneDbConnection > >();