From 39613bfca156c8bec47583ebd2cb3dbd940e8390 Mon Sep 17 00:00:00 2001 From: Mordred Admin Date: Fri, 27 Jul 2018 10:57:04 +0200 Subject: [PATCH] Renamed SkillHandler -> ActionHandler --- src/servers/sapphire_zone/Network/GameConnection.cpp | 2 +- src/servers/sapphire_zone/Network/GameConnection.h | 2 +- .../Network/Handlers/{SkillHandler.cpp => ActionHandler.cpp} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/servers/sapphire_zone/Network/Handlers/{SkillHandler.cpp => ActionHandler.cpp} (95%) diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp index b0e78bfa..fc68c282 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.cpp +++ b/src/servers/sapphire_zone/Network/GameConnection.cpp @@ -70,7 +70,7 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive, setZoneHandler( ClientZoneIpcType::DiscoveryHandler, "DiscoveryHandler", &GameConnection::discoveryHandler ); - setZoneHandler( ClientZoneIpcType::SkillHandler, "SkillHandler", &GameConnection::skillHandler ); + setZoneHandler( ClientZoneIpcType::SkillHandler, "ActionHandler", &GameConnection::actionHandler ); setZoneHandler( ClientZoneIpcType::GMCommand1, "GMCommand1", &GameConnection::gm1Handler ); setZoneHandler( ClientZoneIpcType::GMCommand2, "GMCommand2", &GameConnection::gm2Handler ); diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h index 0d9b8ae9..e33a3471 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.h +++ b/src/servers/sapphire_zone/Network/GameConnection.h @@ -117,7 +117,7 @@ public: DECLARE_HANDLER( cfDutyAccepted ); - DECLARE_HANDLER( skillHandler ); + DECLARE_HANDLER( actionHandler ); DECLARE_HANDLER( gm1Handler ); DECLARE_HANDLER( gm2Handler ); diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp similarity index 95% rename from src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp rename to src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp index f7be2a62..8f69d406 100644 --- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp @@ -36,8 +36,8 @@ using namespace Core::Network::Packets; using namespace Core::Network::Packets::Server; using namespace Core::Network::ActorControl; -void Core::Network::GameConnection::skillHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, - Entity::Player& player ) +void Core::Network::GameConnection::actionHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, + Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcSkillHandler >( inPacket );