mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-12 13:37:46 +00:00
Code Activity

Removed old actorspawn structure as it is not used anymore

Browse source
This commit is contained in:
Mordred 2017-12-17 23:49:11 +01:00
parent 19b67d057a
commit 1673292b62
3 changed files with 0 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -486,71 +486,6 @@ struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
uint32_t unk30; uint32_t unk30;
}; };
struct FFXIVIpcActorSpawn : FFXIVIpcBasePacket<ActorSpawn>
{
uint32_t unknown_0;
uint32_t nameId;
uint32_t bnpcBaseId;
uint32_t unknown_C[2];
uint32_t ownerId;
uint32_t unknown_E[2];
uint64_t targetId;
uint32_t fateId;
uint8_t gmRank;
uint8_t spawnIndex;
uint8_t status; /** 1 = alive, 2 = dead, 3 = use pose*/
uint8_t pose; /** sitting, dancing, etc */
uint8_t mobAgressive; /** 0 passive, 2 agressive */
uint8_t mobTypeIcon; /** normal, nm, etc */
uint8_t type; /** 0 = nothing, 1 = player, 2 = npc*/
uint8_t unknown_33;
uint32_t unknown_34;
uint8_t voice;
uint8_t scale;
uint8_t v1;
uint8_t v2;
uint32_t unknown_38_1;
int32_t unknown_89;
int32_t unknown_90;
uint64_t mainWeaponModel;
uint64_t secWeaponModel;
uint64_t craftToolModel;
uint16_t rotation;
uint16_t model; /** 0 if look array is being used */
uint16_t title;
uint8_t typeFlags; /** has something to do with type 4 for mobs */
uint8_t minion;
uint8_t unknown_60; /** for players 01 */
uint8_t unknown_61; /** for players 09 */
uint8_t level;
uint8_t classJob;
uint32_t hPCurr;
uint16_t mPCurr;
uint16_t tPCurr;
uint32_t hPMax;
uint16_t mPMax;
uint16_t tPMax;
Common::OnlineStatus statusIcon;
uint8_t unknown_B0[17];
uint8_t persistantPose;
uint8_t unknown_C0;
uint32_t displayFlags;
Common::StatusEffect effect[30];
uint8_t currentMount;
uint8_t mountHead;
uint8_t mountBody;
uint8_t mountFeet;
uint32_t mountColor;
uint32_t unknown_236;
char name[32];
uint8_t look[28];
uint32_t models[10];
Common::FFXIVARR_POSITION3 pos;
char fcTag[6];
uint8_t unknown_250[10];
};
/** /**
* Structural representation of the packet sent by the server * Structural representation of the packet sent by the server
* to show player movement * to show player movement

1
src/servers/Server_Zone/Actor/Player.cpp
View file

@ -23,7 +23,6 @@
#include "Network/PacketWrappers/ServerNoticePacket.h" #include "Network/PacketWrappers/ServerNoticePacket.h"
#include "Network/PacketWrappers/ChatPacket.h" #include "Network/PacketWrappers/ChatPacket.h"
#include "Network/PacketWrappers/ModelEquipPacket.h" #include "Network/PacketWrappers/ModelEquipPacket.h"
#include "Network/PacketWrappers/ActorSpawnPacket.h"
#include "Network/PacketWrappers/UpdateHpMpTpPacket.h" #include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
#include "Network/PacketWrappers/PlayerStateFlagsPacket.h" #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
#include "Network/PacketWrappers/PlayerSpawnPacket.h" #include "Network/PacketWrappers/PlayerSpawnPacket.h"

91
src/servers/Server_Zone/Network/PacketWrappers/ActorSpawnPacket.h
View file

@ -1,91 +0,0 @@
#ifndef _ACTORSPAWN_H
#define _ACTORSPAWN_H
#include <Server_Common/Network/GamePacketNew.h>
#include <Server_Common/Util/UtilMath.h>
#include "Actor/Player.h"
#include "Forwards.h"
namespace Core {
namespace Network {
namespace Packets {
namespace Server {
/**
* @brief The packet sent to spawn an actor.
*/
class ActorSpawnPacket :
public GamePacketNew< FFXIVIpcActorSpawn, ServerZoneIpcType >
{
public:
ActorSpawnPacket( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget ) :
GamePacketNew< FFXIVIpcActorSpawn, ServerZoneIpcType >( pPlayer->getId(), pTarget->getId() )
{
initialize( pPlayer, pTarget );
};
private:
void initialize( Entity::PlayerPtr pPlayer, Entity::PlayerPtr pTarget )
{
// TODO: temporary gm rank
m_data.gmRank = 0xff;
m_data.classJob = static_cast< uint8_t >( pPlayer->getClass() );
m_data.status = static_cast< uint8_t >( pPlayer->getStatus() );
m_data.hPCurr = pPlayer->getHp();
m_data.mPCurr = pPlayer->getMp();
m_data.tPCurr = pPlayer->getTp();
m_data.hPMax = pPlayer->getMaxHp();
m_data.mPMax = pPlayer->getMaxMp();
m_data.tPMax = 3000;
m_data.level = pPlayer->getLevel();
memcpy( m_data.look, pPlayer->getLookArray(), 26 );
m_data.mainWeaponModel = pPlayer->getModelMainWeapon();
m_data.secWeaponModel = pPlayer->getModelSubWeapon();
m_data.models[0] = pPlayer->getModelForSlot( Inventory::EquipSlot::Head );
m_data.models[1] = pPlayer->getModelForSlot( Inventory::EquipSlot::Body );
m_data.models[2] = pPlayer->getModelForSlot( Inventory::EquipSlot::Hands );
m_data.models[3] = pPlayer->getModelForSlot( Inventory::EquipSlot::Legs );
m_data.models[4] = pPlayer->getModelForSlot( Inventory::EquipSlot::Feet );
strcpy( m_data.name, pPlayer->getName().c_str() );
m_data.pos.x = pPlayer->getPos().x;
m_data.pos.y = pPlayer->getPos().y;
m_data.pos.z = pPlayer->getPos().z;
m_data.voice = pPlayer->getVoiceId();
m_data.rotation = Math::Util::floatToUInt16Rot( pPlayer->getRotation() );
m_data.statusIcon = pPlayer->getOnlineStatus();
if( pTarget == pPlayer )
{
m_data.spawnIndex = 0x00;
}
else
{
m_data.spawnIndex = pTarget->getSpawnIdForActorId( pPlayer->getId() );
}
// 0x20 == spawn hidden to be displayed by the spawneffect control
m_data.displayFlags = pPlayer->getStance();
if( pPlayer->getZoningType() != Common::ZoneingType::None )
{
m_data.displayFlags |= 0x20;
}
m_data.targetId = pPlayer->getTargetId();
m_data.type = 1;
m_data.unknown_33 = 4;
//m_data.unknown_38 = 0x70;
//m_data.unknown_60 = 3;
//m_data.unknown_61 = 7;
};
};
}
}
}
}
#endif /*_ACTORSPAWN_H*/