From 6b44dc9a6e98171d0206476b35b5d9dc050b6834 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Thu, 20 Jun 2019 14:48:24 +1000 Subject: [PATCH] rename InitUI -> PlayerSetup, AddStatusEffect -> EffectResult --- src/common/Network/PacketDef/Ipcs.h | 4 ++-- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 4 ++-- src/world/Actor/Chara.cpp | 2 +- src/world/Actor/Player.cpp | 4 ++-- src/world/Actor/PlayerEvent.cpp | 2 +- src/world/Actor/PlayerSql.cpp | 2 +- src/world/Manager/DebugCommandMgr.cpp | 4 ++-- src/world/Network/GameConnection.cpp | 2 +- src/world/Network/Handlers/ClientTriggerHandler.cpp | 2 +- src/world/Network/Handlers/GMCommandHandlers.cpp | 2 +- src/world/Network/Handlers/PacketHandlers.cpp | 2 +- .../{InitUIPacket.h => PlayerSetupPacket.h} | 8 ++++---- 12 files changed, 19 insertions(+), 19 deletions(-) rename src/world/Network/PacketWrappers/{InitUIPacket.h => PlayerSetupPacket.h} (91%) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index c6fdac98..9979c9a9 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -51,7 +51,7 @@ namespace Sapphire::Network::Packets ActorFreeSpawn = 0x0191, InitZone = 0x019A, - AddStatusEffect = 0x0141, + EffectResult = 0x0141, ActorControl142 = 0x0142, ActorControl143 = 0x0143, ActorControl144 = 0x0144, @@ -137,7 +137,7 @@ namespace Sapphire::Network::Packets ObjectDespawn = 0x0182, // updated 4.5 UpdateClassInfo = 0x0183, // updated 4.5 SilentSetClassJob = 0x0184, // updated 4.5 - seems to be the case, not sure if it's actually used for anything - InitUI = 0x0185, // updated 4.5 + PlayerSetup = 0x0185, // updated 4.5 PlayerStats = 0x0186, // updated 4.5 ActorOwner = 0x0187, // updated 4.5 PlayerStateFlags = 0x0188, // updated 4.5 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 80588a04..dc93c0f0 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -305,7 +305,7 @@ namespace Sapphire::Network::Packets::Server * Structural representation of the packet sent by the server * add a status effect */ - struct FFXIVIpcAddStatusEffect : FFXIVIpcBasePacket< AddStatusEffect > + struct FFXIVIpcEffectResult : FFXIVIpcBasePacket< EffectResult > { uint32_t unknown; uint32_t actor_id; @@ -793,7 +793,7 @@ namespace Sapphire::Network::Packets::Server * Structural representation of the packet sent by the server to initialize * the client UI upon initial connection. */ - struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI > + struct FFXIVIpcPlayerSetup : FFXIVIpcBasePacket< PlayerSetup > { // plain C types for a bit until the packet is actually fixed. // makes conversion between different editors easier. diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp index 3942f112..c3a09a0c 100644 --- a/src/world/Actor/Chara.cpp +++ b/src/world/Actor/Chara.cpp @@ -457,7 +457,7 @@ void Sapphire::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEf pEffect->applyStatus(); m_statusEffectMap[ nextSlot ] = pEffect; - auto statusEffectAdd = makeZonePacket< FFXIVIpcAddStatusEffect >( getId() ); + auto statusEffectAdd = makeZonePacket< FFXIVIpcEffectResult >( getId() ); statusEffectAdd->data().actor_id = pEffect->getTargetActorId(); statusEffectAdd->data().actor_id1 = pEffect->getSrcActorId(); diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp index f4abe67c..adab91ab 100644 --- a/src/world/Actor/Player.cpp +++ b/src/world/Actor/Player.cpp @@ -25,7 +25,7 @@ #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" #include "Network/PacketWrappers/ActorControlPacket144.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h" #include "Network/PacketWrappers/ChatPacket.h" #include "Network/PacketWrappers/ModelEquipPacket.h" @@ -1717,7 +1717,7 @@ void Sapphire::Entity::Player::sendZonePackets() } queuePacket( contentFinderList ); - queuePacket( std::make_shared< InitUIPacket >( *this ) ); + queuePacket( std::make_shared< PlayerSetupPacket >( *this ) ); auto classInfoPacket = makeZonePacket< FFXIVIpcPlayerClassInfo >( getId() ); classInfoPacket->data().classId = static_cast< uint8_t >( getClass() ); diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp index 91c9060f..507973c8 100644 --- a/src/world/Actor/PlayerEvent.cpp +++ b/src/world/Actor/PlayerEvent.cpp @@ -4,7 +4,7 @@ #include "Network/GameConnection.h" #include "Network/PacketWrappers/ActorControlPacket142.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h" #include "Network/PacketWrappers/EventStartPacket.h" #include "Network/PacketWrappers/EventPlayPacket.h" diff --git a/src/world/Actor/PlayerSql.cpp b/src/world/Actor/PlayerSql.cpp index 4f5ca3de..91d032a3 100644 --- a/src/world/Actor/PlayerSql.cpp +++ b/src/world/Actor/PlayerSql.cpp @@ -10,7 +10,7 @@ #include #include "Network/GameConnection.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Manager/TerritoryMgr.h" #include "Territory/Zone.h" diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index 796e254d..76c89a7f 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -18,7 +18,7 @@ #include "Network/PacketWrappers/ServerNoticePacket.h" #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/PlayerSpawnPacket.h" #include "Network/GameConnection.h" #include "Script/ScriptMgr.h" @@ -237,7 +237,7 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player& else if( subCommand == "discovery_reset" ) { player.resetDiscovery(); - player.queuePacket( std::make_shared< InitUIPacket >( player ) ); + player.queuePacket( std::make_shared< PlayerSetupPacket >( player ) ); } else if( subCommand == "classjob" ) { diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp index 7109b2ba..e9c9f5f2 100644 --- a/src/world/Network/GameConnection.cpp +++ b/src/world/Network/GameConnection.cpp @@ -10,7 +10,7 @@ #include "Territory/Zone.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Manager/DebugCommandMgr.h" diff --git a/src/world/Network/Handlers/ClientTriggerHandler.cpp b/src/world/Network/Handlers/ClientTriggerHandler.cpp index e7ac0927..c309cc41 100644 --- a/src/world/Network/Handlers/ClientTriggerHandler.cpp +++ b/src/world/Network/Handlers/ClientTriggerHandler.cpp @@ -15,7 +15,7 @@ #include "Network/GameConnection.h" #include "Network/PacketWrappers/ExaminePacket.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/PingPacket.h" #include "Network/PacketWrappers/MoveActorPacket.h" #include "Network/PacketWrappers/ChatPacket.h" diff --git a/src/world/Network/Handlers/GMCommandHandlers.cpp b/src/world/Network/Handlers/GMCommandHandlers.cpp index 9b806521..658b3b73 100644 --- a/src/world/Network/Handlers/GMCommandHandlers.cpp +++ b/src/world/Network/Handlers/GMCommandHandlers.cpp @@ -17,7 +17,7 @@ #include "Territory/Zone.h" #include "Territory/InstanceContent.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/PingPacket.h" #include "Network/PacketWrappers/MoveActorPacket.h" #include "Network/PacketWrappers/ChatPacket.h" diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp index ba97168b..709b65d1 100644 --- a/src/world/Network/Handlers/PacketHandlers.cpp +++ b/src/world/Network/Handlers/PacketHandlers.cpp @@ -21,7 +21,7 @@ #include "Territory/ZonePosition.h" #include "Territory/House.h" -#include "Network/PacketWrappers/InitUIPacket.h" +#include "Network/PacketWrappers/PlayerSetupPacket.h" #include "Network/PacketWrappers/PingPacket.h" #include "Network/PacketWrappers/MoveActorPacket.h" #include "Network/PacketWrappers/ChatPacket.h" diff --git a/src/world/Network/PacketWrappers/InitUIPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h similarity index 91% rename from src/world/Network/PacketWrappers/InitUIPacket.h rename to src/world/Network/PacketWrappers/PlayerSetupPacket.h index 5f678a97..bc2ca1e0 100644 --- a/src/world/Network/PacketWrappers/InitUIPacket.h +++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h @@ -10,14 +10,14 @@ namespace Sapphire::Network::Packets::Server { /** - * @brief The Client UI Initialization packet. This must be sent to the client + * @brief The Client Player Initialization packet. This must be sent to the client * once upon connection to configure the UI. */ - class InitUIPacket : public ZoneChannelPacket< FFXIVIpcInitUI > + class PlayerSetupPacket : public ZoneChannelPacket< FFXIVIpcPlayerSetup > { public: - InitUIPacket( Entity::Player& player ) : - ZoneChannelPacket< FFXIVIpcInitUI >( player.getId(), player.getId() ) + PlayerSetupPacket( Entity::Player& player ) : + ZoneChannelPacket< FFXIVIpcPlayerSetup >( player.getId(), player.getId() ) { initialize( player ); };