mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 08:07:46 +00:00
Code Activity

rename objectcontrol -> objectspawn

Browse source
This commit is contained in:
Adam 2018-02-10 21:51:02 +11:00
parent 69a0af66e5
commit 3d1555209e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/PacketDef/Ipcs.h
View file

@ -103,7 +103,7 @@ namespace Packets {
ActorSetPos = 0x0160, // updated 4.2 ActorSetPos = 0x0160, // updated 4.2
ActorCast = 0x0162, // updated 4.2 ActorCast = 0x0162, // updated 4.2
HateList = 0x0165, // updated 4.2 HateList = 0x0165, // updated 4.2
ObjectControl = 0x0167, // updated 4.2 ObjectSpawn = 0x0167, // updated 4.2
UpdateClassInfo = 0x0169, // updated 4.2 UpdateClassInfo = 0x0169, // updated 4.2
InitUI = 0x016B, // updated 4.2 InitUI = 0x016B, // updated 4.2

2
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -1316,7 +1316,7 @@ struct FFXIVIpcMSQTrackerComplete : FFXIVIpcBasePacket<MSQTrackerComplete>
uint64_t padding4; // last 4 bytes is uint32_t but who cares uint64_t padding4; // last 4 bytes is uint32_t but who cares
}; };
struct FFXIVIpcObjectControl : FFXIVIpcBasePacket<ObjectControl> struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket<ObjectSpawn>
{ {
uint8_t count; uint8_t count;
uint8_t objKind; uint8_t objKind;

4
src/servers/sapphire_zone/Zone/InstanceContent.cpp
View file

@ -223,7 +223,7 @@ void Core::InstanceContent::registerInstanceObj( Core::Entity::InstanceObjectPtr
m_instanceObjects[object->getId()] = object; 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 ) 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 ) for( const auto& playerIt : m_playerMap )
{ {
// send that packet with le data // 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().objKind = object->getObjKind();
eobjStatePacket.data().state = object->getState(); eobjStatePacket.data().state = object->getState();
eobjStatePacket.data().objId = object->getId(); eobjStatePacket.data().objId = object->getId();