From 46133d4f6f9b348052cfe6d42ee2c01aeb09cbfa Mon Sep 17 00:00:00 2001 From: goaaats Date: Tue, 3 Jul 2018 14:20:51 +0200 Subject: [PATCH] Rename ClientActorControl back to ClientTrigger --- src/servers/sapphire_zone/Network/GameConnection.cpp | 2 +- src/servers/sapphire_zone/Network/GameConnection.h | 2 +- .../{ClientActorControlHandler.cpp => ClientTriggerHandler.cpp} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/servers/sapphire_zone/Network/Handlers/{ClientActorControlHandler.cpp => ClientTriggerHandler.cpp} (98%) diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp index ee89e252..01eda6d1 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.cpp +++ b/src/servers/sapphire_zone/Network/GameConnection.cpp @@ -66,7 +66,7 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive, setZoneHandler( ClientZoneIpcType::FcInfoReqHandler, "FcInfoReqHandler", &GameConnection::fcInfoReqHandler ); setZoneHandler( ClientZoneIpcType::ZoneLineHandler, "ZoneLineHandler", &GameConnection::zoneLineHandler ); - setZoneHandler( ClientZoneIpcType::ClientActorControl, "ClientActorControl", &GameConnection::clientActorControlHandler ); + setZoneHandler( ClientZoneIpcType::ClientActorControl, "ClientActorControl", &GameConnection::clientTriggerHandler ); setZoneHandler( ClientZoneIpcType::DiscoveryHandler, "DiscoveryHandler", &GameConnection::discoveryHandler ); diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h index 50a51c38..e4bdffb4 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.h +++ b/src/servers/sapphire_zone/Network/GameConnection.h @@ -98,7 +98,7 @@ public: DECLARE_HANDLER( updatePositionHandler ); DECLARE_HANDLER( chatHandler ); DECLARE_HANDLER( zoneLineHandler ); - DECLARE_HANDLER( clientActorControlHandler ); + DECLARE_HANDLER( clientTriggerHandler ); DECLARE_HANDLER( inventoryModifyHandler ); DECLARE_HANDLER( discoveryHandler ); DECLARE_HANDLER( eventHandlerTalk ); diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientActorControlHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp similarity index 98% rename from src/servers/sapphire_zone/Network/Handlers/ClientActorControlHandler.cpp rename to src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp index 275e6035..565f4c00 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ClientActorControlHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp @@ -39,7 +39,7 @@ using namespace Core::Network::Packets; using namespace Core::Network::Packets::Server; using namespace Core::Network::ActorControl; -void Core::Network::GameConnection::clientActorControlHandler( const Packets::GamePacket& inPacket, +void Core::Network::GameConnection::clientTriggerHandler( const Packets::GamePacket& inPacket, Entity::Player& player ) { auto pLog = g_fw.get< Logger >();