From 3d1555209ebaf3abafbd53cffa45da5dfe0743b6 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 10 Feb 2018 21:51:02 +1100 Subject: [PATCH] rename objectcontrol -> objectspawn --- src/common/Network/PacketDef/Ipcs.h | 2 +- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +- src/servers/sapphire_zone/Zone/InstanceContent.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 75c783c5..d0d8052e 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -103,7 +103,7 @@ namespace Packets { ActorSetPos = 0x0160, // updated 4.2 ActorCast = 0x0162, // updated 4.2 HateList = 0x0165, // updated 4.2 - ObjectControl = 0x0167, // updated 4.2 + ObjectSpawn = 0x0167, // updated 4.2 UpdateClassInfo = 0x0169, // updated 4.2 InitUI = 0x016B, // updated 4.2 diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 330f727d..aba88ad3 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1316,7 +1316,7 @@ struct FFXIVIpcMSQTrackerComplete : FFXIVIpcBasePacket uint64_t padding4; // last 4 bytes is uint32_t but who cares }; -struct FFXIVIpcObjectControl : FFXIVIpcBasePacket +struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket { uint8_t count; uint8_t objKind; diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp index d5c3f94e..777138db 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp +++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp @@ -223,7 +223,7 @@ void Core::InstanceContent::registerInstanceObj( Core::Entity::InstanceObjectPtr m_instanceObjects[object->getId()] = object; - g_log.debug("Registered instance eobj: " + std::to_string( object->getId() ) ); + g_log.debug( "Registered instance eobj: " + std::to_string( object->getId() ) ); } Core::Entity::InstanceObjectPtr Core::InstanceContent::getInstanceObject( uint32_t objId ) @@ -243,7 +243,7 @@ void Core::InstanceContent::updateInstanceObj( Core::Entity::InstanceObjectPtr o for( const auto& playerIt : m_playerMap ) { // send that packet with le data - ZoneChannelPacket< FFXIVIpcObjectControl > eobjStatePacket( playerIt.second->getId() ); + ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( playerIt.second->getId() ); eobjStatePacket.data().objKind = object->getObjKind(); eobjStatePacket.data().state = object->getState(); eobjStatePacket.data().objId = object->getId();