mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 16:37:45 +00:00
Code Activity

Merge pull request #398 from NotAdam/develop

Browse source 
minor reference cleanup and compile warning fixes
This commit is contained in:
Mordred 2018-10-14 16:09:36 +02:00 • committed by GitHub
commit eb39de6f34
6 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
View file

@ -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 ) );

12
src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -72,12 +72,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 ) ) +

36
src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
View file

@ -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 );

24
src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
View file

@ -95,12 +95,12 @@ 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& param4 = packet.data().param4;
const auto& target = packet.data().target;
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 param4 = packet.data().param4;
const auto target = packet.data().target;
auto pLog = g_fw.get< Logger >();
pLog->debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) +
@ -542,12 +542,12 @@ 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 = packet.data().param1;
const auto& param2 = packet.data().param2;
const auto& param3 = packet.data().param3;
const auto& param4 = packet.data().param4;
const auto& target = std::string( packet.data().target );
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 param4 = packet.data().param4;
const auto target = std::string( packet.data().target );
pLog->debug( player.getName() + " used GM2 commandId: " + std::to_string( commandId ) +
", params: " + std::to_string( param1 ) + ", " +

12
src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
View file

@ -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;

12
src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
View file

@ -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 );
@ -317,7 +317,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 ) );
@ -361,7 +361,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 > >();