From 2786ad306abe7487e3fc6bed1123ca8ebc2c3198 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 19 Mar 2012 17:15:35 +0000 Subject: Fixed player heads always pointing north (new EntityHeadLook packet) git-svn-id: http://mc-server.googlecode.com/svn/trunk@424 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_EntityLook.cpp | 37 +++++++++++++++++++++++++++++++---- source/packets/cPacket_EntityLook.h | 36 +++++++++++++++++++++++++++++----- 2 files changed, 64 insertions(+), 9 deletions(-) (limited to 'source/packets') diff --git a/source/packets/cPacket_EntityLook.cpp b/source/packets/cPacket_EntityLook.cpp index 3e0f2bd65..d25f788c0 100644 --- a/source/packets/cPacket_EntityLook.cpp +++ b/source/packets/cPacket_EntityLook.cpp @@ -9,13 +9,16 @@ -cPacket_EntityLook::cPacket_EntityLook(cEntity* a_Entity) +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// cPacket_EntityLook: + +cPacket_EntityLook::cPacket_EntityLook(const cEntity & a_Entity) { m_PacketID = E_ENT_LOOK; - m_UniqueID = a_Entity->GetUniqueID(); - m_Rotation = (char)((a_Entity->GetRotation() / 360.f) * 256); - m_Pitch = (char)((a_Entity->GetPitch() / 360.f) * 256); + m_UniqueID = a_Entity.GetUniqueID(); + m_Rotation = (char)((a_Entity.GetRotation() / 360.f) * 256); + m_Pitch = (char)((a_Entity.GetPitch() / 360.f) * 256); } @@ -33,3 +36,29 @@ void cPacket_EntityLook::Serialize(AString & a_Data) const + +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// cPacket_EntityHeadLook: + +cPacket_EntityHeadLook::cPacket_EntityHeadLook(const cEntity & a_Entity) +{ + m_PacketID = E_ENT_HEAD_LOOK; + + m_UniqueID = a_Entity.GetUniqueID(); + m_HeadYaw = (char)((a_Entity.GetRotation() / 360.f) * 256); +} + + + + + +void cPacket_EntityHeadLook::Serialize(AString & a_Data) const +{ + AppendByte (a_Data, m_PacketID); + AppendInteger(a_Data, m_UniqueID); + AppendByte (a_Data, m_HeadYaw); +} + + + + diff --git a/source/packets/cPacket_EntityLook.h b/source/packets/cPacket_EntityLook.h index 407f9c1da..e4aac18e3 100644 --- a/source/packets/cPacket_EntityLook.h +++ b/source/packets/cPacket_EntityLook.h @@ -8,24 +8,50 @@ class cEntity; -class cPacket_EntityLook : public cPacket + + + + + +class cPacket_EntityLook : + public cPacket { public: - cPacket_EntityLook() + cPacket_EntityLook(void) : m_UniqueID( 0 ) , m_Rotation( 0 ) , m_Pitch( 0 ) { m_PacketID = E_ENT_LOOK; } - cPacket_EntityLook(cEntity* a_Entity); - virtual cPacket* Clone() const { return new cPacket_EntityLook(*this); } + cPacket_EntityLook(const cEntity & a_Entity); + virtual cPacket* Clone(void) const { return new cPacket_EntityLook(*this); } virtual void Serialize(AString & a_Data) const override; int m_UniqueID; char m_Rotation; char m_Pitch; +}; + + + - static const unsigned int c_Size = 1 + 4 + 1 + 1; + +class cPacket_EntityHeadLook : + public cPacket +{ +public: + cPacket_EntityHeadLook(void) + : m_UniqueID( 0 ) + , m_HeadYaw( 0 ) + { m_PacketID = E_ENT_LOOK; } + cPacket_EntityHeadLook(const cEntity & a_Entity); + + virtual cPacket * Clone(void) const { return new cPacket_EntityHeadLook(*this); } + + virtual void Serialize(AString & a_Data) const override; + + int m_UniqueID; + char m_HeadYaw; }; -- cgit v1.2.3