From 20e25d73b9bc857bff5a198cfd40c57927141dd4 Mon Sep 17 00:00:00 2001 From: Mordred Date: Wed, 9 Oct 2019 18:14:53 +0200 Subject: [PATCH] Renamed ActorControl packets and definitions according to usage --- src/common/Network/PacketDef/Ipcs.h | 6 ++--- .../Network/PacketDef/Zone/ServerZoneDef.h | 6 ++--- .../common/housing/CmnDefHousingSignboard.cpp | 2 +- src/world/Action/Action.cpp | 8 +++---- src/world/Action/EventAction.cpp | 4 ++-- src/world/Actor/BNpc.cpp | 6 ++--- src/world/Actor/Chara.cpp | 6 ++--- src/world/Actor/EventObject.cpp | 6 ++--- src/world/Actor/Npc.cpp | 6 ++--- src/world/Actor/Player.cpp | 6 ++--- src/world/Actor/PlayerEvent.cpp | 2 +- src/world/Actor/PlayerInventory.cpp | 6 ++--- src/world/Event/Director.cpp | 4 ++-- src/world/Manager/DebugCommandMgr.cpp | 8 +++---- src/world/Manager/HousingMgr.cpp | 4 ++-- .../Network/Handlers/ClientTriggerHandler.cpp | 2 +- .../Network/Handlers/GMCommandHandlers.cpp | 8 +++---- src/world/Network/Handlers/PacketHandlers.cpp | 8 +++---- ...ontrolPacket142.h => ActorControlPacket.h} | 22 ++++++++--------- ...olPacket143.h => ActorControlSelfPacket.h} | 24 +++++++++---------- ...Packet144.h => ActorControlTargetPacket.h} | 24 +++++++++---------- .../Housing/HousingInteriorTerritory.cpp | 2 +- src/world/Territory/HousingZone.cpp | 2 +- src/world/Territory/InstanceContent.cpp | 6 ++--- src/world/Territory/QuestBattle.cpp | 4 ++-- src/world/Territory/Territory.cpp | 2 +- 26 files changed, 92 insertions(+), 92 deletions(-) rename src/world/Network/PacketWrappers/{ActorControlPacket142.h => ActorControlPacket.h} (53%) rename src/world/Network/PacketWrappers/{ActorControlPacket143.h => ActorControlSelfPacket.h} (53%) rename src/world/Network/PacketWrappers/{ActorControlPacket144.h => ActorControlTargetPacket.h} (52%) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 39a408a5..a26e11d7 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -52,9 +52,9 @@ namespace Sapphire::Network::Packets InitZone = 0x019A, EffectResult = 0x0141, - ActorControl142 = 0x0142, - ActorControl143 = 0x0143, - ActorControl144 = 0x0144, + ActorControl = 0x0142, + ActorControlSelf = 0x0143, + ActorControlTarget = 0x0144, UpdateHpMpTp = 0x0145, /////////////////////////////////////////////////// diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 57ff4756..992b87a1 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -467,7 +467,7 @@ namespace Sapphire::Network::Packets::Server * Structural representation of the packet sent by the server * to update certain player details / status */ - struct FFXIVIpcActorControl142 : FFXIVIpcBasePacket< ActorControl142 > + struct FFXIVIpcActorControl : FFXIVIpcBasePacket< ActorControl > { /* 0000 */ uint16_t category; /* 0002 */ uint16_t padding; @@ -482,7 +482,7 @@ namespace Sapphire::Network::Packets::Server * Structural representation of the packet sent by the server * to update certain player details / status */ - struct FFXIVIpcActorControl143 : FFXIVIpcBasePacket< ActorControl143 > + struct FFXIVIpcActorControlSelf : FFXIVIpcBasePacket< ActorControlSelf > { /* 0000 */ uint16_t category; /* 0002 */ uint16_t padding; @@ -499,7 +499,7 @@ namespace Sapphire::Network::Packets::Server * Structural representation of the packet sent by the server * to update certain player details / status */ - struct FFXIVIpcActorControl144 : FFXIVIpcBasePacket< ActorControl144 > + struct FFXIVIpcActorControlTarget : FFXIVIpcBasePacket< ActorControlTarget > { /* 0000 */ uint16_t category; /* 0002 */ uint16_t padding; diff --git a/src/scripts/common/housing/CmnDefHousingSignboard.cpp b/src/scripts/common/housing/CmnDefHousingSignboard.cpp index cf7ff4bf..a97356e8 100644 --- a/src/scripts/common/housing/CmnDefHousingSignboard.cpp +++ b/src/scripts/common/housing/CmnDefHousingSignboard.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include "Framework.h" diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index 783a84ea..0dd6e67b 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -17,9 +17,9 @@ #include "Territory/Territory.h" #include -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include @@ -325,7 +325,7 @@ void Action::Action::execute() if( hasCastTime() ) { // todo: what's this? - /*auto control = ActorControlPacket143( m_pTarget->getId(), ActorControlType::Unk7, + /*auto control = ActorControlSelfPacket( m_pTarget->getId(), ActorControlType::Unk7, 0x219, m_id, m_id, m_id, m_id ); m_pSource->sendToInRangeSet( control, true );*/ diff --git a/src/world/Action/EventAction.cpp b/src/world/Action/EventAction.cpp index 4cf2cd2b..d5e196e5 100644 --- a/src/world/Action/EventAction.cpp +++ b/src/world/Action/EventAction.cpp @@ -3,8 +3,8 @@ #include #include -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" #include "Actor/Player.h" diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp index 8276842d..340c8fdb 100644 --- a/src/world/Actor/BNpc.cpp +++ b/src/world/Actor/BNpc.cpp @@ -14,9 +14,9 @@ #include "Territory/Territory.h" #include "Network/GameConnection.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include "Network/PacketWrappers/UpdateHpMpTpPacket.h" #include "Network/PacketWrappers/NpcSpawnPacket.h" #include "Network/PacketWrappers/MoveActorPacket.h" diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp index 77f9004f..4948eff6 100644 --- a/src/world/Actor/Chara.cpp +++ b/src/world/Actor/Chara.cpp @@ -11,9 +11,9 @@ #include "Territory/Territory.h" #include "Network/GameConnection.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include "Network/PacketWrappers/UpdateHpMpTpPacket.h" #include "Network/PacketWrappers/EffectPacket.h" diff --git a/src/world/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp index cc34720e..b95a1550 100644 --- a/src/world/Actor/EventObject.cpp +++ b/src/world/Actor/EventObject.cpp @@ -3,9 +3,9 @@ #include "Territory/InstanceContent.h" #include "Actor/Player.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include #include diff --git a/src/world/Actor/Npc.cpp b/src/world/Actor/Npc.cpp index 6dcf112f..d795aabb 100644 --- a/src/world/Actor/Npc.cpp +++ b/src/world/Actor/Npc.cpp @@ -12,9 +12,9 @@ #include "Territory/Territory.h" #include "Network/GameConnection.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include "Network/PacketWrappers/UpdateHpMpTpPacket.h" #include "Network/PacketWrappers/EffectPacket.h" diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index c7ddadee..4cebfab7 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -22,9 +22,9 @@ #include "Territory/Land.h" #include "Network/GameConnection.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h" #include "Network/PacketWrappers/ChatPacket.h" diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp index 7db09d0b..b4fb05a1 100644 --- a/src/world/Actor/PlayerEvent.cpp +++ b/src/world/Actor/PlayerEvent.cpp @@ -3,7 +3,7 @@ #include #include "Network/GameConnection.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" +#include "Network/PacketWrappers/ActorControlPacket.h" #include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h" #include "Network/PacketWrappers/EventStartPacket.h" diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp index 720f2f2e..36459884 100644 --- a/src/world/Actor/PlayerInventory.cpp +++ b/src/world/Actor/PlayerInventory.cpp @@ -5,8 +5,8 @@ #include "Territory/Territory.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" #include "Network/PacketWrappers/UpdateInventorySlotPacket.h" #include "Inventory/Item.h" @@ -25,7 +25,7 @@ #include "Actor/Player.h" #include "Network/PacketWrappers/ServerNoticePacket.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" #include "Manager/InventoryMgr.h" #include "Manager/ItemMgr.h" diff --git a/src/world/Event/Director.cpp b/src/world/Event/Director.cpp index 00710e77..75fcae89 100644 --- a/src/world/Event/Director.cpp +++ b/src/world/Event/Director.cpp @@ -6,8 +6,8 @@ #include "Actor/Player.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" #include diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index 2cad42bb..9fef637d 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -16,8 +16,8 @@ #include "DebugCommandMgr.h" #include "Network/PacketWrappers/ServerNoticePacket.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" #include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/PlayerSpawnPacket.h" #include "Network/GameConnection.h" @@ -494,7 +494,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& player.sendNotice( "Injecting ACTOR_CONTROL {0}", opcode ); - auto actorControl = makeZonePacket< FFXIVIpcActorControl143 >( playerId, player.getId() ); + auto actorControl = makeZonePacket< FFXIVIpcActorControlSelf >( playerId, player.getId() ); actorControl->data().category = opcode; actorControl->data().param1 = param1; actorControl->data().param2 = param2; @@ -511,7 +511,7 @@ void Sapphire::World::Manager::DebugCommandMgr::add( char* data, Entity::Player& player.queuePacket( noticePacket ); - Network::Packets::Server::ActorControlPacket143 controlPacket( player, opcode, + Network::Packets::Server::ActorControlSelfPacket controlPacket( player, opcode, param1, param2, param3, param4, param5, param6, playerId ); player.queuePacket( controlPacket );*/ diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp index 5c773e9f..c9db8f72 100644 --- a/src/world/Manager/HousingMgr.cpp +++ b/src/world/Manager/HousingMgr.cpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp index b47ed892..3286469f 100644 --- a/src/world/Network/Handlers/ClientTriggerHandler.cpp +++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp @@ -20,7 +20,7 @@ #include "Network/PacketWrappers/MoveActorPacket.h" #include "Network/PacketWrappers/ChatPacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" +#include "Network/PacketWrappers/ActorControlPacket.h" #include "Manager/DebugCommandMgr.h" #include "Manager/EventMgr.h" diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp index 7dd91a2e..b2f48567 100644 --- a/src/world/Network/Handlers/GMCommandHandlers.cpp +++ b/src/world/Network/Handlers/GMCommandHandlers.cpp @@ -22,9 +22,9 @@ #include "Network/PacketWrappers/MoveActorPacket.h" #include "Network/PacketWrappers/ChatPacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include "Network/PacketWrappers/EventStartPacket.h" #include "Network/PacketWrappers/EventFinishPacket.h" #include "Network/PacketWrappers/PlayerStateFlagsPacket.h" @@ -458,7 +458,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw, case GmCommand::Wireframe: { player.queuePacket( - std::make_shared< ActorControlPacket143 >( player.getId(), ActorControlType::ToggleWireframeRendering ) ); + std::make_shared< ActorControlSelfPacket >( player.getId(), ActorControlType::ToggleWireframeRendering ) ); player.sendNotice( "Wireframe Rendering for {0} was toggled", player.getName() ); break; } diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp index c4166431..8b51595d 100644 --- a/src/world/Network/Handlers/PacketHandlers.cpp +++ b/src/world/Network/Handlers/PacketHandlers.cpp @@ -26,9 +26,9 @@ #include "Network/PacketWrappers/MoveActorPacket.h" #include "Network/PacketWrappers/ChatPacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" +#include "Network/PacketWrappers/ActorControlTargetPacket.h" #include "Network/PacketWrappers/EventStartPacket.h" #include "Network/PacketWrappers/EventFinishPacket.h" #include "Network/PacketWrappers/PlayerStateFlagsPacket.h" @@ -299,7 +299,7 @@ void Sapphire::Network::GameConnection::zoneLineHandler( FrameworkPtr pFw, auto preparePacket = makeZonePacket< FFXIVIpcPrepareZoning >( player.getId() ); preparePacket->data().targetZone = targetZone; - //ActorControlPacket143 controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg, + //ActorControlSelfPacket controlPacket( pPlayer, ActorControlType::DespawnZoneScreenMsg, // 0x03, player.getId(), 0x01, targetZone ); player.queuePacket( preparePacket ); } diff --git a/src/world/Network/PacketWrappers/ActorControlPacket142.h b/src/world/Network/PacketWrappers/ActorControlPacket.h similarity index 53% rename from src/world/Network/PacketWrappers/ActorControlPacket142.h rename to src/world/Network/PacketWrappers/ActorControlPacket.h index 30f14598..99a70b77 100644 --- a/src/world/Network/PacketWrappers/ActorControlPacket142.h +++ b/src/world/Network/PacketWrappers/ActorControlPacket.h @@ -11,17 +11,17 @@ namespace Sapphire::Network::Packets::Server /** * @brief The Ping response packet. */ - class ActorControlPacket142 : public ZoneChannelPacket< FFXIVIpcActorControl142 > + class ActorControlPacket : public ZoneChannelPacket< FFXIVIpcActorControl > { public: - ActorControlPacket142( uint32_t actorId, - uint16_t category, - uint32_t param1 = 0, - uint32_t param2 = 0, - uint32_t param3 = 0, - uint32_t param4 = 0, - uint32_t padding1 = 0 ) : - ZoneChannelPacket< FFXIVIpcActorControl142 >( actorId, actorId ) + ActorControlPacket( uint32_t actorId, + uint16_t category, + uint32_t param1 = 0, + uint32_t param2 = 0, + uint32_t param3 = 0, + uint32_t param4 = 0, + uint32_t padding1 = 0 ) : + ZoneChannelPacket< FFXIVIpcActorControl >( actorId, actorId ) { initialize( category, param1, param2, param3, param4 ); }; @@ -39,9 +39,9 @@ namespace Sapphire::Network::Packets::Server }; template< typename... Args > - std::shared_ptr< ActorControlPacket142 > makeActorControl142( Args... args ) + std::shared_ptr< ActorControlPacket > makeActorControl142( Args... args ) { - return std::make_shared< ActorControlPacket142 >( args... ); + return std::make_shared< ActorControlPacket >( args... ); } } diff --git a/src/world/Network/PacketWrappers/ActorControlPacket143.h b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h similarity index 53% rename from src/world/Network/PacketWrappers/ActorControlPacket143.h rename to src/world/Network/PacketWrappers/ActorControlSelfPacket.h index c93b3db3..58f0e617 100644 --- a/src/world/Network/PacketWrappers/ActorControlPacket143.h +++ b/src/world/Network/PacketWrappers/ActorControlSelfPacket.h @@ -12,18 +12,18 @@ namespace Sapphire::Network::Packets::Server /** * @brief The Ping response packet. */ - class ActorControlPacket143 : public ZoneChannelPacket< FFXIVIpcActorControl143 > + class ActorControlSelfPacket : public ZoneChannelPacket< FFXIVIpcActorControlSelf > { public: - ActorControlPacket143( uint32_t actorId, - uint16_t category, - uint32_t param1 = 0, - uint32_t param2 = 0, - uint32_t param3 = 0, - uint32_t param4 = 0, - uint32_t param5 = 0, - uint32_t padding1 = 0 ) : - ZoneChannelPacket< FFXIVIpcActorControl143 >( actorId, actorId ) + ActorControlSelfPacket( uint32_t actorId, + uint16_t category, + uint32_t param1 = 0, + uint32_t param2 = 0, + uint32_t param3 = 0, + uint32_t param4 = 0, + uint32_t param5 = 0, + uint32_t padding1 = 0 ) : + ZoneChannelPacket< FFXIVIpcActorControlSelf >( actorId, actorId ) { initialize( category, param1, param2, param3, param4, param5 ); }; @@ -43,9 +43,9 @@ namespace Sapphire::Network::Packets::Server }; template< typename... Args > - std::shared_ptr< ActorControlPacket143 > makeActorControl143( Args... args ) + std::shared_ptr< ActorControlSelfPacket > makeActorControl143( Args... args ) { - return std::make_shared< ActorControlPacket143 >( args... ); + return std::make_shared< ActorControlSelfPacket >( args... ); } } diff --git a/src/world/Network/PacketWrappers/ActorControlPacket144.h b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h similarity index 52% rename from src/world/Network/PacketWrappers/ActorControlPacket144.h rename to src/world/Network/PacketWrappers/ActorControlTargetPacket.h index da645b1e..f80046b7 100644 --- a/src/world/Network/PacketWrappers/ActorControlPacket144.h +++ b/src/world/Network/PacketWrappers/ActorControlTargetPacket.h @@ -10,18 +10,18 @@ namespace Sapphire::Network::Packets::Server /** * @brief The Ping response packet. */ - class ActorControlPacket144 : public ZoneChannelPacket< FFXIVIpcActorControl144 > + class ActorControlTargetPacket : public ZoneChannelPacket< FFXIVIpcActorControlTarget > { public: - ActorControlPacket144( uint32_t actorId, - uint16_t category, - uint32_t param1 = 0, - uint32_t param2 = 0, - uint32_t param3 = 0, - uint32_t param4 = 0, - uint64_t targetId = 0, - uint32_t padding1 = 0 ) : - ZoneChannelPacket< FFXIVIpcActorControl144 >( actorId, actorId ) + ActorControlTargetPacket( uint32_t actorId, + uint16_t category, + uint32_t param1 = 0, + uint32_t param2 = 0, + uint32_t param3 = 0, + uint32_t param4 = 0, + uint64_t targetId = 0, + uint32_t padding1 = 0 ) : + ZoneChannelPacket< FFXIVIpcActorControlTarget >( actorId, actorId ) { initialize( category, param1, param2, param3, param4, targetId ); }; @@ -41,9 +41,9 @@ namespace Sapphire::Network::Packets::Server }; template< typename... Args > - std::shared_ptr< ActorControlPacket144 > makeActorControl144( Args... args ) + std::shared_ptr< ActorControlTargetPacket > makeActorControl144( Args... args ) { - return std::make_shared< ActorControlPacket144 >( args... ); + return std::make_shared< ActorControlTargetPacket >( args... ); } } diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp index 0b8985d4..eff95302 100644 --- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp +++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include "Actor/Player.h" diff --git a/src/world/Territory/HousingZone.cpp b/src/world/Territory/HousingZone.cpp index c252b909..1473ff62 100644 --- a/src/world/Territory/HousingZone.cpp +++ b/src/world/Territory/HousingZone.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include "Actor/Player.h" diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp index 267da084..c0467fc5 100644 --- a/src/world/Territory/InstanceContent.cpp +++ b/src/world/Territory/InstanceContent.cpp @@ -13,8 +13,8 @@ #include "Actor/Player.h" #include "Actor/EventObject.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" #include "Event/EventHandler.h" @@ -410,7 +410,7 @@ void Sapphire::InstanceContent::setCurrentBGM( uint16_t bgmIndex ) auto player = playerIt.second; // note: retail do send a BGM_MUTE(1) first before any BGM transition, but YOLO in this case. // also do note that this code can't control the bgm granularly. (i.e. per player for WoD submap.) oops. - // player->queuePacket( ActorControlPacket143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) ); + // player->queuePacket( ActorControlSelfPacket( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) ); player->queuePacket( makeActorControl143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmIndex ) ); } diff --git a/src/world/Territory/QuestBattle.cpp b/src/world/Territory/QuestBattle.cpp index 63e60b9b..8bcc518c 100644 --- a/src/world/Territory/QuestBattle.cpp +++ b/src/world/Territory/QuestBattle.cpp @@ -15,8 +15,8 @@ #include "Actor/BNpc.h" #include "Actor/BNpcTemplate.h" -#include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/ActorControlPacket.h" +#include "Network/PacketWrappers/ActorControlSelfPacket.h" #include "Event/EventHandler.h" diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp index dcfce47b..765d4b1f 100644 --- a/src/world/Territory/Territory.cpp +++ b/src/world/Territory/Territory.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "Territory.h" #include "InstanceContent.h"