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

Renamed ActorControl packets and definitions according to usage

Browse source
This commit is contained in:
Mordred 2019-10-09 18:14:53 +02:00
parent f78936b3d2
commit 20e25d73b9
26 changed files with 92 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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,
///////////////////////////////////////////////////

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

@ -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;

2
src/scripts/common/housing/CmnDefHousingSignboard.cpp
View file

@ -2,7 +2,7 @@
#include <Actor/Player.h>
#include <Territory/HousingZone.h>
#include <Manager/HousingMgr.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/PacketWrappers/ActorControlSelfPacket.h>
#include <Network/CommonActorControl.h>
#include <Exd/ExdDataGenerated.h>
#include "Framework.h"

8
src/world/Action/Action.cpp
View file

@ -17,9 +17,9 @@
#include "Territory/Territory.h"
#include <Network/CommonActorControl.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 <Logging/Logger.h>
@ -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 );*/

4
src/world/Action/EventAction.cpp
View file

@ -3,8 +3,8 @@
#include <Exd/ExdDataGenerated.h>
#include <Network/CommonActorControl.h>
#include "Network/PacketWrappers/ActorControlPacket142.h"
#include "Network/PacketWrappers/ActorControlPacket143.h"
#include "Network/PacketWrappers/ActorControlPacket.h"
#include "Network/PacketWrappers/ActorControlSelfPacket.h"
#include "Actor/Player.h"

6
src/world/Actor/BNpc.cpp
View file

@ -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"

6
src/world/Actor/Chara.cpp
View file

@ -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"

6
src/world/Actor/EventObject.cpp
View file

@ -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 <Logging/Logger.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>

6
src/world/Actor/Npc.cpp
View file

@ -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"

6
src/world/Actor/Player.cpp
View file

@ -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"

2
src/world/Actor/PlayerEvent.cpp
View file

@ -3,7 +3,7 @@
#include <Network/PacketContainer.h>
#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"

6
src/world/Actor/PlayerInventory.cpp
View file

@ -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"

4
src/world/Event/Director.cpp
View file

@ -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 <Logging/Logger.h>

8
src/world/Manager/DebugCommandMgr.cpp
View file

@ -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 );*/

4
src/world/Manager/HousingMgr.cpp
View file

@ -4,8 +4,8 @@
#include <Exd/ExdDataGenerated.h>
#include <Network/PacketContainer.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/PacketWrappers/ActorControlPacket142.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/PacketWrappers/ActorControlPacket.h>
#include <Network/PacketWrappers/ActorControlSelfPacket.h>
#include <Network/CommonActorControl.h>
#include <unordered_map>

2
src/world/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -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"

8
src/world/Network/Handlers/GMCommandHandlers.cpp
View file

@ -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;
}

8
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -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 );
}

22
src/world/Network/PacketWrappers/ActorControlPacket142.h → src/world/Network/PacketWrappers/ActorControlPacket.h
View file

@ -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... );
}
}

24
src/world/Network/PacketWrappers/ActorControlPacket143.h → src/world/Network/PacketWrappers/ActorControlSelfPacket.h
View file

@ -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... );
}
}

24
src/world/Network/PacketWrappers/ActorControlPacket144.h → src/world/Network/PacketWrappers/ActorControlTargetPacket.h
View file

@ -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... );
}
}

2
src/world/Territory/Housing/HousingInteriorTerritory.cpp
View file

@ -6,7 +6,7 @@
#include <Exd/ExdDataGenerated.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/PacketWrappers/ActorControlSelfPacket.h>
#include <Network/CommonActorControl.h>
#include "Actor/Player.h"

2
src/world/Territory/HousingZone.cpp
View file

@ -6,7 +6,7 @@
#include <Exd/ExdDataGenerated.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/PacketWrappers/ActorControlSelfPacket.h>
#include <Network/CommonActorControl.h>
#include "Actor/Player.h"

6
src/world/Territory/InstanceContent.cpp
View file

@ -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 ) );
}

4
src/world/Territory/QuestBattle.cpp
View file

@ -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"

2
src/world/Territory/Territory.cpp
View file

@ -13,7 +13,7 @@
#include <Network/PacketContainer.h>
#include <Network/CommonActorControl.h>
#include <Database/DatabaseDef.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/PacketWrappers/ActorControlSelfPacket.h>
#include "Territory.h"
#include "InstanceContent.h"