Core/Movement

* Updated movement flags
* Cleaned up MovementStatusElements enum
* Updated and enabled MSG_MOVE_START_FORWARD
This commit is contained in:
Shauren committed 2012-07-14 23:39:12 +02:00
1 parent 2d144e4925
commit 27ea130b55
15 files changed
+1386 -1272

No files matched your search

+8 -7
View File
@@ -47,6 +47,7 @@
#include "OutdoorPvPMgr.h"
#include "MovementPacketBuilder.h"
#include "DynamicTree.h"
#include "Unit.h"
uint32 GuidHigh2TypeId(uint32 guid_hi)
{
@@ -331,13 +332,13 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
data->WriteBit(0);
data->WriteBit(!((movementFlags & (MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) ||
(movementFlagsExtra & MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING))); // Has pitch
data->WriteBit(movementFlags & MOVEMENTFLAG_SPLINE_ENABLED); // Has spline data
data->WriteBit(self->IsSplineEnabled()); // Has spline data
data->WriteBit(movementFlagsExtra & MOVEMENTFLAG2_INTERPOLATED_TURNING);// Has fall data
data->WriteBit(!(movementFlags & MOVEMENTFLAG_SPLINE_ELEVATION)); // Has spline elevation
data->WriteBit(guid[5]);
data->WriteBit(movementFlags & MOVEMENTFLAG_ONTRANSPORT); // Has transport data
data->WriteBit(self->m_movementInfo.t_guid); // Has transport data
data->WriteBit(0); // Is missing time
if (movementFlags & MOVEMENTFLAG_ONTRANSPORT)
if (self->m_movementInfo.t_guid)
{
ObjectGuid transGuid = self->m_movementInfo.t_guid;
@@ -354,7 +355,7 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
}
data->WriteBit(guid[4]);
if (movementFlags & MOVEMENTFLAG_SPLINE_ENABLED)
if (self->IsSplineEnabled())
{
data->WriteBit(1); // Has extended spline data
Movement::PacketBuilder::WriteCreateBits(*self->movespline, *data);
@@ -440,12 +441,12 @@ void Object::_BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
if (movementFlags & MOVEMENTFLAG_SPLINE_ELEVATION)
*data << float(self->m_movementInfo.splineElevation);
if (movementFlags & MOVEMENTFLAG_SPLINE_ENABLED)
if (self->IsSplineEnabled())
Movement::PacketBuilder::WriteCreateData(*self->movespline, *data);
*data << float(self->GetPositionZMinusOffset());
data->WriteByteSeq(guid[5]);
if (movementFlags & MOVEMENTFLAG_ONTRANSPORT)
if (self->m_movementInfo.t_guid)
{
ObjectGuid transGuid = self->m_movementInfo.t_guid;
@@ -1298,7 +1299,7 @@ void MovementInfo::OutDebug()
sLog->outString("flags2 %u", flags2);
sLog->outString("time %u current time " UI64FMTD "", flags2, uint64(::time(NULL)));
sLog->outString("position: `%s`", pos.ToString().c_str());
if (flags & MOVEMENTFLAG_ONTRANSPORT)
if (t_guid)
{
sLog->outString("TRANSPORT:");
sLog->outString("guid: " UI64FMTD, t_guid);
+2 -2
View File
@@ -529,16 +529,16 @@ struct MovementInfo
// transport
uint64 t_guid;
Position t_pos;
int8 t_seat;
uint32 t_time;
uint32 t_time2;
uint32 t_time3;
int8 t_seat;
// swimming/flying
float pitch;
// falling
uint32 fallTime;
// jumping
float j_zspeed, j_sinAngle, j_cosAngle, j_xyspeed;
float j_zspeed, j_cosAngle, j_sinAngle, j_xyspeed;
// spline
float splineElevation;
+2 -3
View File
@@ -2176,15 +2176,14 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
if (m_transport)
{
if (options & TELE_TO_NOT_LEAVE_TRANSPORT)
AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
else
if (!(options & TELE_TO_NOT_LEAVE_TRANSPORT))
{
m_transport->RemovePassenger(this);
m_transport = NULL;
m_movementInfo.t_pos.Relocate(0.0f, 0.0f, 0.0f, 0.0f);
m_movementInfo.t_time = 0;
m_movementInfo.t_seat = -1;
m_movementInfo.t_guid = 0;
}
}
@@ -642,8 +642,7 @@ uint32 Transport::AddNPCPassenger(uint32 tguid, uint32 entry, float x, float y,
}
creature->SetTransport(this);
creature->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
creature->m_movementInfo.guid = GetGUID();
creature->m_movementInfo.t_guid = GetGUID();
creature->m_movementInfo.t_pos.Relocate(x, y, z, o);
if (anim)
+8 -3
View File
@@ -396,7 +396,7 @@ void Unit::UpdateSplineMovement(uint32 t_diff)
m_movesplineTimer.Reset(POSITION_UPDATE_DELAY);
Movement::Location loc = movespline->ComputePosition();
if (HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
if (GetTransGUID())
{
Position& pos = m_movementInfo.t_pos;
pos.m_positionX = loc.x;
@@ -420,7 +420,7 @@ void Unit::UpdateSplineMovement(uint32 t_diff)
void Unit::DisableSpline()
{
m_movementInfo.RemoveMovementFlag(MovementFlags(MOVEMENTFLAG_SPLINE_ENABLED|MOVEMENTFLAG_FORWARD));
m_movementInfo.RemoveMovementFlag(MOVEMENTFLAG_FORWARD);
movespline->_Interrupt();
}
@@ -17644,7 +17644,7 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const
*data << GetPositionZMinusOffset();
*data << GetOrientation();
bool onTransport = GetUnitMovementFlags() & MOVEMENTFLAG_ONTRANSPORT;
bool onTransport = m_movementInfo.t_guid != 0;
bool hasInterpolatedMovement = m_movementInfo.flags2 & MOVEMENTFLAG2_INTERPOLATED_MOVEMENT;
bool time3 = false;
bool swimming = ((GetUnitMovementFlags() & (MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING))
@@ -18180,3 +18180,8 @@ void Unit::SendMovementCanFlyChange()
BuildMovementPacket(&data);
SendMessageToSet(&data, false);
}
bool Unit::IsSplineEnabled() const
{
return !movespline->Finalized();
}
+21 -22
View File
@@ -675,28 +675,26 @@ enum MovementFlags
MOVEMENTFLAG_PITCH_UP = 0x00000040,
MOVEMENTFLAG_PITCH_DOWN = 0x00000080,
MOVEMENTFLAG_WALKING = 0x00000100, // Walking
MOVEMENTFLAG_ONTRANSPORT = 0x00000200, // Used for flying on some creatures
MOVEMENTFLAG_DISABLE_GRAVITY = 0x00000400, // Former MOVEMENTFLAG_LEVITATING. This is used when walking is not possible.
MOVEMENTFLAG_ROOT = 0x00000800, // Must not be set along with MOVEMENTFLAG_MASK_MOVING
MOVEMENTFLAG_FALLING = 0x00001000, // damage dealt on that type of falling
MOVEMENTFLAG_FALLING_FAR = 0x00002000,
MOVEMENTFLAG_PENDING_STOP = 0x00004000,
MOVEMENTFLAG_PENDING_STRAFE_STOP = 0x00008000,
MOVEMENTFLAG_PENDING_FORWARD = 0x00010000,
MOVEMENTFLAG_PENDING_BACKWARD = 0x00020000,
MOVEMENTFLAG_PENDING_STRAFE_LEFT = 0x00040000,
MOVEMENTFLAG_PENDING_STRAFE_RIGHT = 0x00080000,
MOVEMENTFLAG_PENDING_ROOT = 0x00100000,
MOVEMENTFLAG_SWIMMING = 0x00200000, // appears with fly flag also
MOVEMENTFLAG_ASCENDING = 0x00400000, // press "space" when flying
MOVEMENTFLAG_DESCENDING = 0x00800000,
MOVEMENTFLAG_CAN_FLY = 0x01000000, // Appears when unit can fly AND also walk
MOVEMENTFLAG_FLYING = 0x02000000, // unit is actually flying. pretty sure this is only used for players. creatures use disable_gravity
MOVEMENTFLAG_SPLINE_ELEVATION = 0x04000000, // used for flight paths
MOVEMENTFLAG_SPLINE_ENABLED = 0x08000000, // used for flight paths
MOVEMENTFLAG_WATERWALKING = 0x10000000, // prevent unit from falling through water
MOVEMENTFLAG_FALLING_SLOW = 0x20000000, // active rogue safe fall spell (passive)
MOVEMENTFLAG_HOVER = 0x40000000, // hover, cannot jump
MOVEMENTFLAG_DISABLE_GRAVITY = 0x00000200, // Former MOVEMENTFLAG_LEVITATING. This is used when walking is not possible.
MOVEMENTFLAG_ROOT = 0x00000400, // Must not be set along with MOVEMENTFLAG_MASK_MOVING
MOVEMENTFLAG_FALLING = 0x00000800, // damage dealt on that type of falling
MOVEMENTFLAG_FALLING_FAR = 0x00001000,
MOVEMENTFLAG_PENDING_STOP = 0x00002000,
MOVEMENTFLAG_PENDING_STRAFE_STOP = 0x00004000,
MOVEMENTFLAG_PENDING_FORWARD = 0x00008000,
MOVEMENTFLAG_PENDING_BACKWARD = 0x00010000,
MOVEMENTFLAG_PENDING_STRAFE_LEFT = 0x00020000,
MOVEMENTFLAG_PENDING_STRAFE_RIGHT = 0x00040000,
MOVEMENTFLAG_PENDING_ROOT = 0x00080000,
MOVEMENTFLAG_SWIMMING = 0x00100000, // appears with fly flag also
MOVEMENTFLAG_ASCENDING = 0x00200000, // press "space" when flying
MOVEMENTFLAG_DESCENDING = 0x00400000,
MOVEMENTFLAG_CAN_FLY = 0x00800000, // Appears when unit can fly AND also walk
MOVEMENTFLAG_FLYING = 0x01000000, // unit is actually flying. pretty sure this is only used for players. creatures use disable_gravity
MOVEMENTFLAG_SPLINE_ELEVATION = 0x02000000, // used for flight paths
MOVEMENTFLAG_WATERWALKING = 0x04000000, // prevent unit from falling through water
MOVEMENTFLAG_FALLING_SLOW = 0x08000000, // active rogue safe fall spell (passive)
MOVEMENTFLAG_HOVER = 0x10000000, // hover, cannot jump
// TODO: Check if PITCH_UP and PITCH_DOWN really belong here..
MOVEMENTFLAG_MASK_MOVING =
@@ -2103,6 +2101,7 @@ class Unit : public WorldObject
uint16 HasExtraUnitMovementFlag(uint16 f) const { return m_movementInfo.flags2 & f; }
uint16 GetExtraUnitMovementFlags() const { return m_movementInfo.flags2; }
void SetExtraUnitMovementFlags(uint16 f) { m_movementInfo.flags2 = f; }
bool IsSplineEnabled() const;
float GetPositionZMinusOffset() const
{
@@ -342,7 +342,6 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
if (seat->second.SeatInfo->m_flags && !(seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_ALLOW_TURNING))
unit->AddUnitState(UNIT_STATE_ONVEHICLE);
unit->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
VehicleSeatEntry const* veSeat = seat->second.SeatInfo;
unit->m_movementInfo.t_pos.m_positionX = veSeat->m_attachmentOffsetX;
unit->m_movementInfo.t_pos.m_positionY = veSeat->m_attachmentOffsetY;
@@ -419,7 +418,6 @@ void Vehicle::RemovePassenger(Unit* unit)
if (_me->IsInWorld())
{
unit->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
unit->m_movementInfo.t_pos.Relocate(0, 0, 0, 0);
unit->m_movementInfo.t_time = 0;
unit->m_movementInfo.t_seat = 0;
+376 -299
View File
@@ -277,7 +277,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData)
}
/* handle special cases */
if (movementInfo.flags & MOVEMENTFLAG_ONTRANSPORT)
if (movementInfo.t_guid)
{
// transports size limited
// (also received at zeppelin leave by some reason with t_* as absolute in continent coordinates, can be safely skipped)
@@ -339,7 +339,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData)
{
GameObject* go = mover->GetMap()->GetGameObject(movementInfo.t_guid);
if (!go || go->GetGoType() != GAMEOBJECT_TYPE_TRANSPORT)
movementInfo.flags &= ~MOVEMENTFLAG_ONTRANSPORT;
movementInfo.t_guid = 0;
}
}
else if (plrMover && plrMover->GetTransport()) // if we were on a transport, leave
@@ -595,167 +595,205 @@ void WorldSession::HandleSummonResponseOpcode(WorldPacket& recv_data)
_player->SummonIfPossible(agree);
}
void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi)
void WorldSession::ReadMovementInfo(WorldPacket& data, MovementInfo* mi)
{
bool HaveTransportData = false,
HaveTransportTime2 = false,
HaveTransportTime3 = false,
HavePitch = false,
HaveFallData = false,
HaveFallDirection = false,
HaveSplineElevation = false,
HaveSpline = false;
bool hasMovementFlags = false;
bool hasMovementFlags2 = false;
bool hasTimestamp = false;
bool hasOrientation = false;
bool hasTransportData = false;
bool hasTransportTime2 = false;
bool hasTransportTime3 = false;
bool hasPitch = false;
bool hasFallData = false;
bool hasFallDirection = false;
bool hasSplineElevation = false;
bool hasSpline = false;
MovementStatusElements *sequence = GetMovementStatusElementsSequence(data.GetOpcode());
if (sequence == NULL)
return;
MovementStatusElements* sequence = GetMovementStatusElementsSequence(data.GetOpcode());
if (sequence == NULL)
{
sLog->outError("WorldSession::ReadMovementInfo: No movement sequence found for opcode 0x%04X", uint32(data.GetOpcode()));
return;
}
ObjectGuid guid;
ObjectGuid tguid;
ObjectGuid guid;
ObjectGuid tguid;
for (uint32 i = 0; i < MSE_COUNT; i++)
{
MovementStatusElements element = sequence[i];
for (uint32 i = 0; i < MSE_COUNT; ++i)
{
MovementStatusElements element = sequence[i];
if (element == MSEEnd)
break;
if (element >= MSEGuidByte0 && element <= MSEGuidByte7)
{
guid[element - MSEGuidByte0] = data.ReadBit();
continue;
}
if (element >= MSEHasGuidByte0 && element <= MSEHasGuidByte7)
{
guid[element - MSEHasGuidByte0] = data.ReadBit();
continue;
}
if (element >= MSETransportGuidByte0 &&
element <= MSETransportGuidByte7)
{
if (HaveTransportData)
tguid[element - MSETransportGuidByte0] = data.ReadBit();
continue;
}
if (element >= MSEHasTransportGuidByte0 &&
element <= MSEHasTransportGuidByte7)
{
if (hasTransportData)
tguid[element - MSEHasTransportGuidByte0] = data.ReadBit();
continue;
}
if (element >= MSEGuidByte0_2 && element <= MSEGuidByte7_2)
{
data.ReadByteSeq(guid[element - MSEGuidByte0_2]);
continue;
}
if (element >= MSEGuidByte0 && element <= MSEGuidByte7)
{
data.ReadByteSeq(guid[element - MSEGuidByte0]);
continue;
}
if (element >= MSETransportGuidByte0_2 &&
element <= MSETransportGuidByte7_2)
{
if (HaveTransportData)
data.ReadByteSeq(tguid[element - MSETransportGuidByte0_2]);
continue;
}
if (element >= MSETransportGuidByte0 &&
element <= MSETransportGuidByte7)
{
if (hasTransportData)
data.ReadByteSeq(tguid[element - MSETransportGuidByte0]);
continue;
}
switch (element)
{
case MSEFlags:
mi->flags = data.ReadBits(30);
break;
case MSEFlags2:
mi->flags2 = data.ReadBits(12);
break;
case MSETimestamp:
data >> mi->time;
break;
case MSEHavePitch:
HavePitch = data.ReadBit();
break;
case MSEHaveFallData:
HaveFallData = data.ReadBit();
break;
case MSEHaveFallDirection:
if (HaveFallData)
HaveFallDirection = data.ReadBit();
break;
case MSEHaveTransportData:
HaveTransportData = data.ReadBit();
break;
case MSETransportHaveTime2:
if (HaveTransportData)
HaveTransportTime2 = data.ReadBit();
break;
case MSETransportHaveTime3:
if (HaveTransportData)
HaveTransportTime3 = data.ReadBit();
break;
case MSEHaveSpline:
HaveSpline = data.ReadBit();
break;
case MSEHaveSplineElev:
HaveSplineElevation = data.ReadBit();
break;
case MSEPositionX:
data >> mi->pos.PositionXYZStream();
break;
case MSEPositionY:
case MSEPositionZ:
break; // assume they always go as vector of 3
case MSEPositionO:
data >> mi->pos.m_orientation;
break;
case MSEPitch:
if (HavePitch)
data >> mi->pitch;
break;
case MSEFallTime:
if (HaveFallData)
data >> mi->fallTime;
break;
case MSESplineElev:
if (HaveSplineElevation)
data >> mi->splineElevation;
break;
case MSEFallHorizontalSpeed:
if (HaveFallDirection)
data >> mi->j_xyspeed;
break;
case MSEFallVerticalSpeed:
if (HaveFallData)
data >> mi->j_zspeed;
break;
case MSEFallCosAngle:
if (HaveFallDirection)
data >> mi->j_cosAngle;
break;
case MSEFallSinAngle:
if (HaveFallDirection)
data >> mi->j_sinAngle;
break;
case MSETransportSeat:
if (HaveTransportData)
data >> mi->t_seat;
break;
case MSETransportPositionO:
if (HaveTransportData)
data >> mi->t_pos.m_orientation;
break;
case MSETransportPositionX:
if (HaveTransportData)
data >> mi->t_pos.PositionXYZStream();
break;
case MSETransportPositionY:
case MSETransportPositionZ:
break; // assume they always go as vector of 3
case MSETransportTime:
if (HaveTransportData)
data >> mi->t_time;
break;
case MSETransportTime2:
if (HaveTransportTime2)
data >> mi->t_time2;
break;
case MSETransportTime3:
if (HaveTransportTime3)
data >> mi->t_time3;
break;
default:
WPError(false, "Incorrect sequence element detected at ReadMovementInfo");
}
}
switch (element)
{
case MSEHasMovementFlags:
hasMovementFlags = !data.ReadBit();
break;
case MSEHasMovementFlags2:
hasMovementFlags2 = !data.ReadBit();
break;
case MSEHasTimestamp:
hasTimestamp = !data.ReadBit();
break;
case MSEHasOrientation:
hasOrientation = !data.ReadBit();
break;
case MSEHasTransportData:
hasTransportData = data.ReadBit();
break;
case MSEHasTransportTime2:
if (hasTransportData)
hasTransportTime2 = data.ReadBit();
break;
case MSEHasTransportTime3:
if (hasTransportData)
hasTransportTime3 = data.ReadBit();
break;
case MSEHasPitch:
hasPitch = !data.ReadBit();
break;
case MSEHasFallData:
hasFallData = data.ReadBit();
break;
case MSEHasFallDirection:
if (hasFallData)
hasFallDirection = data.ReadBit();
break;
case MSEHasSplineElev:
hasSplineElevation = !data.ReadBit();
break;
case MSEHasSpline:
hasSpline = data.ReadBit();
break;
case MSEMovementFlags:
if (hasMovementFlags)
mi->flags = data.ReadBits(30);
break;
case MSEMovementFlags2:
if (hasMovementFlags2)
mi->flags2 = data.ReadBits(12);
break;
case MSETimestamp:
if (hasTimestamp)
data >> mi->time;
break;
case MSEPositionX:
data >> mi->pos.m_positionX;
break;
case MSEPositionY:
data >> mi->pos.m_positionY;
break;
case MSEPositionZ:
data >> mi->pos.m_positionZ;
break;
case MSEOrientation:
if (hasOrientation)
data >> mi->pos.m_orientation;
break;
case MSETransportPositionX:
if (hasTransportData)
data >> mi->t_pos.m_positionX;
break;
case MSETransportPositionY:
if (hasTransportData)
data >> mi->t_pos.m_positionY;
break;
case MSETransportPositionZ:
if (hasTransportData)
data >> mi->t_pos.m_positionZ;
break;
case MSETransportOrientation:
if (hasTransportData)
data >> mi->t_pos.m_orientation;
break;
case MSETransportSeat:
if (hasTransportData)
data >> mi->t_seat;
break;
case MSETransportTime:
if (hasTransportData)
data >> mi->t_time;
break;
case MSETransportTime2:
if (hasTransportData && hasTransportTime2)
data >> mi->t_time2;
break;
case MSETransportTime3:
if (hasTransportData && hasTransportTime3)
data >> mi->t_time3;
break;
case MSEPitch:
if (hasPitch)
data >> mi->pitch;
break;
case MSEFallTime:
if (hasFallData)
data >> mi->fallTime;
break;
case MSEFallVerticalSpeed:
if (hasFallData)
data >> mi->j_zspeed;
break;
case MSEFallCosAngle:
if (hasFallDirection)
data >> mi->j_cosAngle;
break;
case MSEFallSinAngle:
if (hasFallDirection)
data >> mi->j_sinAngle;
break;
case MSEFallHorizontalSpeed:
if (hasFallDirection)
data >> mi->j_xyspeed;
break;
case MSESplineElev:
if (hasSplineElevation)
data >> mi->splineElevation;
break;
case MSEZeroBit:
case MSEOneBit:
data.ReadBit();
break;
default:
ASSERT(false && "Incorrect sequence element detected at ReadMovementInfo");
break;
}
}
mi->guid = guid;
mi->t_guid = tguid;
mi->guid = guid;
mi->t_guid = tguid;
if (HaveTransportData && mi->pos.m_positionX != mi->t_pos.m_positionX)
if (hasTransportData && mi->pos.m_positionX != mi->t_pos.m_positionX)
if (GetPlayer()->GetTransport())
GetPlayer()->GetTransport()->UpdatePosition(mi);
@@ -834,157 +872,196 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi)
void WorldSession::WriteMovementInfo(WorldPacket &data, MovementInfo* mi)
{
bool HaveTransportData = mi->HasMovementFlag(MOVEMENTFLAG_ONTRANSPORT),
HaveTransportTime2 = (mi->flags2 & MOVEMENTFLAG2_INTERPOLATED_MOVEMENT) != 0,
HaveTransportTime3 = false,
HavePitch = (mi->HasMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)))
|| (mi->flags2 & MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING),
HaveFallData = mi->HasExtraMovementFlag(MOVEMENTFLAG2_INTERPOLATED_TURNING),
HaveFallDirection = mi->HasMovementFlag(MOVEMENTFLAG_FALLING),
HaveSplineElevation = mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION),
HaveSpline = false;
bool hasMovementFlags = mi->GetMovementFlags() != 0;
bool hasMovementFlags2 = mi->GetExtraMovementFlags() != 0;
bool hasTimestamp = mi->time != 0;
bool hasOrientation = !G3D::fuzzyEq(mi->pos.GetOrientation(), 0.0f);
bool hasTransportData = mi->t_guid != 0;
bool hasTransportTime2 = mi->HasExtraMovementFlag(MOVEMENTFLAG2_INTERPOLATED_MOVEMENT);
bool hasTransportTime3 = false;
bool hasPitch = mi->HasMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || mi->HasExtraMovementFlag(MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING);
bool hasFallData = mi->HasExtraMovementFlag(MOVEMENTFLAG2_INTERPOLATED_TURNING);
bool hasFallDirection = mi->HasMovementFlag(MOVEMENTFLAG_FALLING);
bool hasSplineElevation = mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION);
bool hasSpline = false;
MovementStatusElements *sequence = GetMovementStatusElementsSequence(data.GetOpcode());
if(!sequence)
return;
uint8 *guid = (uint8 *)&mi->guid;
uint8 *tguid = (uint8 *)&mi->t_guid;
for(uint32 i=0; i < MSE_COUNT; i++)
{
MovementStatusElements element = sequence[i];
MovementStatusElements* sequence = GetMovementStatusElementsSequence(data.GetOpcode());
if (!sequence)
{
sLog->outError("WorldSession::WriteMovementInfo: No movement sequence found for opcode 0x%04X", uint32(data.GetOpcode()));
return;
}
if (element >= MSEGuidByte0 && element <= MSEGuidByte7)
{
data.WriteBit(guid[element - MSEGuidByte0]);
continue;
}
ObjectGuid guid = mi->guid;
ObjectGuid tguid = mi->t_guid;
if (element >= MSETransportGuidByte0 &&
element <= MSETransportGuidByte7)
{
if (HaveTransportData)
data.WriteBit(tguid[element - MSETransportGuidByte0]);
continue;
}
for(uint32 i = 0; i < MSE_COUNT; ++i)
{
MovementStatusElements element = sequence[i];
if (element >= MSEGuidByte0_2 && element <= MSEGuidByte7_2)
{
data.WriteByteSeq(guid[element - MSEGuidByte0_2]);
continue;
}
if (element >= MSEHasGuidByte0 && element <= MSEHasGuidByte7)
{
data.WriteBit(guid[element - MSEHasGuidByte0]);
continue;
}
if (element >= MSETransportGuidByte0_2 &&
element <= MSETransportGuidByte7_2)
{
if (HaveTransportData)
data.WriteByteSeq(tguid[element - MSETransportGuidByte0_2]);
continue;
}
if (element >= MSEHasTransportGuidByte0 &&
element <= MSEHasTransportGuidByte7)
{
if (hasTransportData)
data.WriteBit(tguid[element - MSEHasTransportGuidByte0]);
continue;
}
switch (element)
{
case MSEFlags:
data.WriteBits(mi->flags, 30);
break;
case MSEFlags2:
data.WriteBits(mi->flags2, 12);
break;
case MSETimestamp:
data << mi->time;
break;
case MSEHavePitch:
data.WriteBit(HavePitch);
break;
case MSEHaveFallData:
data.WriteBit(HaveFallData);
break;
case MSEHaveFallDirection:
if (HaveFallData)
data.WriteBit(HaveFallDirection);
break;
case MSEHaveTransportData:
data.WriteBit(HaveTransportData);
break;
case MSETransportHaveTime2:
if (HaveTransportData)
data.WriteBit(HaveTransportTime2);
break;
case MSETransportHaveTime3:
if (HaveTransportData)
data.WriteBit(HaveTransportTime3);
break;
case MSEHaveSpline:
data.WriteBit(HaveSpline);
break;
case MSEHaveSplineElev:
data.WriteBit(HaveSplineElevation);
break;
case MSEPositionX:
data << mi->pos.PositionXYZStream();
break;
case MSEPositionY:
case MSEPositionZ:
break; // assume they always go as vector of 3
case MSEPositionO:
data << mi->pos.m_orientation;
break;
case MSEPitch:
if (HavePitch)
data << mi->pitch;
break;
case MSEFallTime:
if (HaveFallData)
data << mi->fallTime;
break;
case MSESplineElev:
if (HaveSplineElevation)
data << mi->splineElevation;
break;
case MSEFallHorizontalSpeed:
if (HaveFallDirection)
data << mi->j_xyspeed;
break;
case MSEFallVerticalSpeed:
if (HaveFallData)
data << mi->j_zspeed;
break;
case MSEFallCosAngle:
if (HaveFallDirection)
data << mi->j_cosAngle;
break;
case MSEFallSinAngle:
if (HaveFallDirection)
data << mi->j_sinAngle;
break;
case MSETransportSeat:
if (HaveTransportData)
data << mi->t_seat;
break;
case MSETransportPositionO:
if (HaveTransportData)
data << mi->t_pos.m_orientation;
break;
case MSETransportPositionX:
if (HaveTransportData)
data << mi->t_pos.PositionXYZStream();
break;
case MSETransportPositionY:
case MSETransportPositionZ:
break; // assume they always go as vector of 3
case MSETransportTime:
if (HaveTransportData)
data << mi->t_time;
break;
case MSETransportTime2:
if (HaveTransportTime2)
data << mi->t_time2;
break;
case MSETransportTime3:
if (HaveTransportTime3)
data << mi->t_time3;
break;
default:
WPError(false, "Incorrect sequence element detected at ReadMovementInfo");
}
}
if (element >= MSEGuidByte0 && element <= MSEGuidByte7)
{
data.WriteByteSeq(guid[element - MSEGuidByte0]);
continue;
}
if (element >= MSETransportGuidByte0 &&
element <= MSETransportGuidByte7)
{
if (hasTransportData)
data.WriteByteSeq(tguid[element - MSETransportGuidByte0]);
continue;
}
switch (element)
{
case MSEHasMovementFlags:
data.WriteBit(!hasMovementFlags);
break;
case MSEHasMovementFlags2:
data.WriteBit(!hasMovementFlags2);
break;
case MSEHasTimestamp:
data.WriteBit(!hasTimestamp);
break;
case MSEHasOrientation:
data.WriteBit(!hasOrientation);
break;
case MSEHasTransportData:
data.WriteBit(hasTransportData);
break;
case MSEHasTransportTime2:
if (hasTransportData)
data.WriteBit(hasTransportTime2);
break;
case MSEHasTransportTime3:
if (hasTransportData)
data.WriteBit(hasTransportTime3);
break;
case MSEHasPitch:
data.WriteBit(!hasPitch);
break;
case MSEHasFallData:
data.WriteBit(hasFallData);
break;
case MSEHasFallDirection:
if (hasFallData)
data.WriteBit(hasFallDirection);
break;
case MSEHasSplineElev:
data.WriteBit(!hasSplineElevation);
break;
case MSEHasSpline:
data.WriteBit(hasSpline);
break;
case MSEMovementFlags:
if (hasMovementFlags)
data.WriteBits(mi->flags, 30);
break;
case MSEMovementFlags2:
if (hasMovementFlags2)
data.WriteBits(mi->flags2, 12);
break;
case MSETimestamp:
if (hasTimestamp)
data << mi->time;
break;
case MSEPositionX:
data << mi->pos.m_positionX;
break;
case MSEPositionY:
data << mi->pos.m_positionY;
break;
case MSEPositionZ:
data << mi->pos.m_positionZ;
break;
case MSEOrientation:
if (hasOrientation)
data << mi->pos.m_orientation;
break;
case MSETransportPositionX:
if (hasTransportData)
data << mi->t_pos.m_positionX;
break;
case MSETransportPositionY:
if (hasTransportData)
data << mi->t_pos.m_positionY;
break;
case MSETransportPositionZ:
if (hasTransportData)
data << mi->t_pos.m_positionZ;
break;
case MSETransportOrientation:
if (hasTransportData)
data << mi->t_pos.m_orientation;
break;
case MSETransportSeat:
if (hasTransportData)
data << mi->t_seat;
break;
case MSETransportTime:
if (hasTransportData)
data << mi->t_time;
break;
case MSETransportTime2:
if (hasTransportData && hasTransportTime2)
data << mi->t_time2;
break;
case MSETransportTime3:
if (hasTransportData && hasTransportTime3)
data << mi->t_time3;
break;
case MSEPitch:
if (hasPitch)
data << mi->pitch;
break;
case MSEFallTime:
if (hasFallData)
data << mi->fallTime;
break;
case MSEFallVerticalSpeed:
if (hasFallData)
data << mi->j_zspeed;
break;
case MSEFallCosAngle:
if (hasFallDirection)
data << mi->j_cosAngle;
break;
case MSEFallSinAngle:
if (hasFallDirection)
data << mi->j_sinAngle;
break;
case MSEFallHorizontalSpeed:
if (hasFallDirection)
data << mi->j_xyspeed;
break;
case MSESplineElev:
if (hasSplineElevation)
data << mi->splineElevation;
break;
case MSEZeroBit:
data.WriteBit(0);
break;
case MSEOneBit:
data.WriteBit(1);
break;
default:
ASSERT(false && "Incorrect sequence element detected at ReadMovementInfo");
break;
}
}
}
File diff suppressed because it is too large. Load diff
@@ -63,7 +63,7 @@ namespace Movement
bool transport = false;
Location real_position(unit.GetPositionX(), unit.GetPositionY(), unit.GetPositionZMinusOffset(), unit.GetOrientation());
// Elevators also use MOVEMENTFLAG_ONTRANSPORT but we do not keep track of their position changes
if (unit.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit.GetTransGUID())
if (unit.GetTransGUID())
{
transport = true;
real_position.x = unit.GetTransOffsetX();
@@ -91,7 +91,7 @@ namespace Movement
else
moveFlags &= ~MOVEMENTFLAG_WALKING;
moveFlags |= (MOVEMENTFLAG_SPLINE_ENABLED|MOVEMENTFLAG_FORWARD);
moveFlags |= MOVEMENTFLAG_FORWARD;
if (!args.HasVelocity)
args.velocity = unit.GetSpeed(SelectSpeedType(moveFlags));
@@ -120,7 +120,7 @@ namespace Movement
MoveSplineInit::MoveSplineInit(Unit& m) : unit(m)
{
// Elevators also use MOVEMENTFLAG_ONTRANSPORT but we do not keep track of their position changes
args.TransformForTransport = unit.HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit.GetTransGUID();
args.TransformForTransport = unit.GetTransGUID();
// mix existing state into new
args.flags.walkmode = unit.m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING);
args.flags.flying = unit.m_movementInfo.HasMovementFlag((MovementFlags)(MOVEMENTFLAG_CAN_FLY|MOVEMENTFLAG_DISABLE_GRAVITY));
+1 -1
View File
@@ -735,7 +735,7 @@ void InitOpcodes()
//DEFINE_OPCODE_HANDLER(MSG_MOVE_START_ASCEND, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
//DEFINE_OPCODE_HANDLER(MSG_MOVE_START_BACKWARD, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
//DEFINE_OPCODE_HANDLER(MSG_MOVE_START_DESCEND, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
//DEFINE_OPCODE_HANDLER(MSG_MOVE_START_FORWARD, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
DEFINE_OPCODE_HANDLER(MSG_MOVE_START_FORWARD, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
//DEFINE_OPCODE_HANDLER(MSG_MOVE_START_PITCH_DOWN, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
//DEFINE_OPCODE_HANDLER(MSG_MOVE_START_PITCH_UP, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
//DEFINE_OPCODE_HANDLER(MSG_MOVE_START_STRAFE_LEFT, STATUS_LOGGEDIN, PROCESS_THREADSAFE, &WorldSession::HandleMovementOpcodes );
-2
View File
@@ -166,8 +166,6 @@ void WorldSession::SendPacket(WorldPacket const* packet)
if (packet->GetOpcode() == NULL_OPCODE || packet->GetOpcode() == UNKNOWN_OPCODE)
{
sLog->outError("Prevented sending of %s", packet->GetOpcode() == NULL_OPCODE ? "NULL_OPCODE" : "UNKNOWN_OPCODE");
//ACE_Stack_Trace trace;
//sLog->outError("%s", trace.c_str());
return;
}
@@ -433,7 +433,7 @@ public:
{
me->SetVisible(false);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY);
me->AddUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
me->SetSpeed(MOVE_WALK, 5.0f, true);
wp_reached = false;
count = 0;
@@ -466,7 +466,7 @@ public:
instance->SetData(GAMEOBJECT_PUMPKIN_SHRINE, 0); //hide gameobject
break;
case 19:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY);
me->RemoveUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
break;
case 20:
{
@@ -264,7 +264,7 @@ public:
{
OrbsEmpowered = 0;
EmpowerCount = 0;
me->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY);
me->AddUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->setActive(true);
@@ -452,7 +452,7 @@ public:
summoned->CastSpell(summoned, SPELL_SHADOW_CHANNELING, false);
break;
case CREATURE_ANVEENA:
summoned->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT | MOVEMENTFLAG_DISABLE_GRAVITY);
summoned->AddUnitMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);
summoned->CastSpell(summoned, SPELL_ANVEENA_PRISON, true);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
break;
@@ -130,9 +130,9 @@ bool GrandChampionsOutVehicle(Creature* me)
if (pGrandChampion1 && pGrandChampion2 && pGrandChampion3)
{
if (!pGrandChampion1->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) &&
!pGrandChampion2->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) &&
!pGrandChampion3->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
if (!pGrandChampion1->m_movementInfo.t_guid &&
!pGrandChampion2->m_movementInfo.t_guid &&
!pGrandChampion3->m_movementInfo.t_guid)
return true;
}
@@ -384,7 +384,7 @@ public:
}
}else uiPhaseTimer -= uiDiff;
if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
if (!UpdateVictim() || me->m_movementInfo.t_guid)
return;
if (uiInterceptTimer <= uiDiff)
@@ -528,7 +528,7 @@ public:
uiFireBallTimer = 5000;
} else uiFireBallTimer -= uiDiff;
if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
if (!UpdateVictim() || me->m_movementInfo.t_guid)
return;
if (uiFireBallTimer <= uiDiff)
@@ -666,7 +666,7 @@ public:
}
}else uiPhaseTimer -= uiDiff;
if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
if (!UpdateVictim() || me->m_movementInfo.t_guid)
return;
if (uiChainLightningTimer <= uiDiff)
@@ -812,7 +812,7 @@ public:
}
}else uiPhaseTimer -= uiDiff;
if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
if (!UpdateVictim() || me->m_movementInfo.t_guid)
return;
if (uiLightningArrowsTimer <= uiDiff)
@@ -960,7 +960,7 @@ public:
}
} else uiPhaseTimer -= uiDiff;
if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT))
if (!UpdateVictim() || me->m_movementInfo.t_guid)
return;
if (uiEviscerateTimer <= uiDiff)