aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/Object.cpp95
-rw-r--r--src/game/Player.h9
-rw-r--r--src/game/Unit.cpp41
-rw-r--r--src/game/Unit.h10
4 files changed, 59 insertions, 96 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index f09e466e4b8..4d650a86c46 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -261,12 +261,6 @@ void Object::DestroyForPlayer(Player *target) const
void Object::_BuildMovementUpdate(ByteBuffer * data, uint8 flags, uint32 flags2) const
{
- uint16 unk_flags = ((GetTypeId() == TYPEID_PLAYER) ? ((Player*)this)->m_movementInfo.unk1 : 0);
-
- if(GetTypeId() == TYPEID_UNIT)
- if(((Creature*)this)->isVehicle())
- unk_flags |= 0x20; // always allow pitch
-
*data << (uint8)flags; // update flags
// 0x20
@@ -282,6 +276,8 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint8 flags, uint32 flags2)
else
flags2 &= ~MOVEMENTFLAG_ONTRANSPORT;
flags2 &= ~MOVEMENTFLAG_SPLINE2;
+ if(((Creature*)this)->isVehicle())
+ ((Unit*)this)->m_movementInfo.unk1 |= 0x20; // always allow pitch
}
break;
case TYPEID_PLAYER:
@@ -306,7 +302,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint8 flags, uint32 flags2)
}
*data << uint32(flags2); // movement flags
- *data << uint16(unk_flags); // unknown 2.3.0
+ *data << uint16(((Unit*)this)->m_movementInfo.unk1);// unknown 2.3.0
*data << uint32(getMSTime()); // time (in milliseconds)
}
@@ -333,62 +329,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint8 flags, uint32 flags2)
// 0x20
if(flags & UPDATEFLAG_LIVING)
{
- // 0x00000200
- if(flags2 & MOVEMENTFLAG_ONTRANSPORT)
- {
- if(((Unit*)this)->m_Vehicle)
- *data << (uint64)((Unit*)this)->m_Vehicle->GetGUID();
- else
- *data << (uint64)((Player*)this)->GetTransport()->GetGUID();
- *data << (float)((Unit*)this)->GetTransOffsetX();
- *data << (float)((Unit*)this)->GetTransOffsetY();
- *data << (float)((Unit*)this)->GetTransOffsetZ();
- *data << (float)((Unit*)this)->GetTransOffsetO();
- *data << (uint32)((Unit*)this)->GetTransTime();
- *data << (int8)((Unit*)this)->GetTransSeat();
- }
-
- // 0x02200000
- if((flags2 & (MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING2)) || (unk_flags & 0x20))
- {
- if(GetTypeId() == TYPEID_PLAYER)
- *data << (float)((Player*)this)->m_movementInfo.s_pitch;
- else
- *data << (float)0; // is't part of movement packet, we must store and send it...
- }
-
- if(GetTypeId() == TYPEID_PLAYER)
- *data << (uint32)((Player*)this)->m_movementInfo.fallTime;
- else
- *data << (uint32)0; // last fall time
-
- // 0x00001000
- if(flags2 & MOVEMENTFLAG_JUMPING)
- {
- if(GetTypeId() == TYPEID_PLAYER)
- {
- *data << (float)((Player*)this)->m_movementInfo.j_unk;
- *data << (float)((Player*)this)->m_movementInfo.j_sinAngle;
- *data << (float)((Player*)this)->m_movementInfo.j_cosAngle;
- *data << (float)((Player*)this)->m_movementInfo.j_xyspeed;
- }
- else
- {
- *data << (float)0;
- *data << (float)0;
- *data << (float)0;
- *data << (float)0;
- }
- }
-
- // 0x04000000
- if(flags2 & MOVEMENTFLAG_SPLINE)
- {
- if(GetTypeId() == TYPEID_PLAYER)
- *data << (float)((Player*)this)->m_movementInfo.u_unk1;
- else
- *data << (float)0;
- }
+ ((Unit*)this)->BuildMovementPacket(data);
*data << ((Unit*)this)->GetSpeed( MOVE_WALK );
*data << ((Unit*)this)->GetSpeed( MOVE_RUN );
@@ -1612,18 +1553,8 @@ void WorldObject::BuildHeartBeatMsg(WorldPacket *data) const
*data << m_positionY;
*data << m_positionZ;
*data << m_orientation;
- if(((Unit*)this)->m_Vehicle)
- {
- *data << uint64(((Unit*)this)->m_Vehicle->GetGUID());
- *data << float (((Unit*)this)->GetTransOffsetX());
- *data << float (((Unit*)this)->GetTransOffsetY());
- *data << float (((Unit*)this)->GetTransOffsetZ());
- *data << float (((Unit*)this)->GetTransOffsetO());
- *data << uint32(((Unit*)this)->GetTransTime());
- *data << uint8 (((Unit*)this)->GetTransSeat());
- sLog.outError("heart seat is %u", ((Unit*)this)->GetTransTime());
- }
- *data << uint32(0); //fall time
+
+ ((Unit*)this)->BuildMovementPacket(data);
}
void WorldObject::BuildTeleportAckMsg(WorldPacket *data, float x, float y, float z, float ang) const
@@ -1642,18 +1573,8 @@ void WorldObject::BuildTeleportAckMsg(WorldPacket *data, float x, float y, float
*data << y;
*data << z;
*data << ang;
- if(((Unit*)this)->m_Vehicle)
- {
- *data << uint64(((Unit*)this)->m_Vehicle->GetGUID());
- *data << float (((Unit*)this)->GetTransOffsetX());
- *data << float (((Unit*)this)->GetTransOffsetY());
- *data << float (((Unit*)this)->GetTransOffsetZ());
- *data << float (((Unit*)this)->GetTransOffsetO());
- *data << uint32(((Unit*)this)->GetTransTime());
- *data << uint8 (((Unit*)this)->GetTransSeat());
- sLog.outError("seat is %u", ((Unit*)this)->GetTransTime());
- }
- *data << uint32(0);
+
+ ((Unit*)this)->BuildMovementPacket(data);
}
void WorldObject::SendMessageToSet(WorldPacket *data, bool /*fake*/, bool bToPossessor)
diff --git a/src/game/Player.h b/src/game/Player.h
index 7796ecba624..481b81585a5 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -48,12 +48,10 @@ class DynamicObject;
class Creature;
class Pet;
class PlayerMenu;
-class Transport;
class UpdateMask;
class SpellCastTargets;
class PlayerSocial;
class OutdoorPvP;
-class Vehicle;
typedef std::deque<Mail*> PlayerMails;
@@ -1910,10 +1908,6 @@ class TRINITY_DLL_SPEC Player : public Unit
void StopCastingCharm();
void StopCastingBindSight();
- // Transports
- Transport * GetTransport() const { return m_transport; }
- void SetTransport(Transport * t) { m_transport = t; }
-
uint32 GetSaveTimer() const { return m_nextSave; }
void SetSaveTimer(uint32 timer) { m_nextSave = timer; }
@@ -2234,9 +2228,6 @@ class TRINITY_DLL_SPEC Player : public Unit
RestType rest_type;
////////////////////Rest System/////////////////////
- // Transports
- Transport * m_transport;
-
uint32 m_resetTalentsCost;
time_t m_resetTalentsTime;
uint32 m_usedTalentCount;
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 365e55cd22d..fbbfa3a2638 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -52,6 +52,7 @@
#include "Traveller.h"
#include "TemporarySummon.h"
#include "Vehicle.h"
+#include "Transports.h"
#include <math.h>
@@ -13535,6 +13536,46 @@ void Unit::ExitVehicle()
m_Vehicle = NULL;
}
+void Unit::BuildMovementPacket(ByteBuffer *data) const
+{
+ // 0x00000200
+ if(GetUnitMovementFlags() & MOVEMENTFLAG_ONTRANSPORT)
+ {
+ if(m_Vehicle)
+ *data << (uint64)m_Vehicle->GetGUID();
+ else if(GetTransport())
+ *data << (uint64)GetTransport()->GetGUID();
+ else
+ *data << (uint64)0;
+ *data << float (GetTransOffsetX());
+ *data << float (GetTransOffsetY());
+ *data << float (GetTransOffsetZ());
+ *data << float (GetTransOffsetO());
+ *data << uint32(GetTransTime());
+ *data << uint8 (GetTransSeat());
+ }
+
+ // 0x02200000
+ if((GetUnitMovementFlags() & (MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING2))
+ || (m_movementInfo.unk1 & 0x20))
+ *data << (float)m_movementInfo.s_pitch;
+
+ *data << (uint32)m_movementInfo.fallTime;
+
+ // 0x00001000
+ if(GetUnitMovementFlags() & MOVEMENTFLAG_JUMPING)
+ {
+ *data << (float)m_movementInfo.j_unk;
+ *data << (float)m_movementInfo.j_sinAngle;
+ *data << (float)m_movementInfo.j_cosAngle;
+ *data << (float)m_movementInfo.j_xyspeed;
+ }
+
+ // 0x04000000
+ if(GetUnitMovementFlags() & MOVEMENTFLAG_SPLINE)
+ *data << (float)m_movementInfo.u_unk1;
+}
+
void Unit::NearTeleportTo( float x, float y, float z, float orientation, bool casting /*= false*/ )
{
if(GetTypeId() == TYPEID_PLAYER)
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 1e50ed1e255..fa02de0f5f8 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -314,6 +314,7 @@ class Path;
class PetAura;
class Guardian;
class UnitAI;
+class Transport;
struct SpellImmune
{
@@ -1629,11 +1630,20 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
void EnterVehicle(Vehicle *vehicle);
void ExitVehicle();
+
+ // Transports
+ Transport * GetTransport() const { return m_transport; }
+ void SetTransport(Transport * t) { m_transport = t; }
+
+ void BuildMovementPacket(ByteBuffer *data) const;
protected:
explicit Unit ();
UnitAI *i_AI, *i_disabledAI;
+ // Transports
+ Transport * m_transport;
+
void _UpdateSpells(uint32 time);
void _DeleteAuras();