diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-06-18 18:15:33 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-06-18 18:15:33 +0200 |
| commit | 89ec90753914ae89b2dbbc7a343cd8a667410af3 (patch) | |
| tree | 4e6ce6db829b74c80633c5535490677044b2eea6 /src/server/game/Server | |
| parent | 47ea7943e5dcd77305631bc453c52c31646be2ea (diff) | |
Core/Objects: Refactored MovementInfo structure
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index c30a9a28fab..00aa43a4f47 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -769,16 +769,16 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi) if (mi->HasMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) { - data.readPackGUID(mi->t_guid); + data.readPackGUID(mi->transport.guid); - data >> mi->t_pos.PositionXYZOStream(); - data >> mi->t_time; - data >> mi->t_seat; + data >> mi->transport.pos.PositionXYZOStream(); + data >> mi->transport.time; + data >> mi->transport.seat; if (mi->HasExtraMovementFlag(MOVEMENTFLAG2_INTERPOLATED_MOVEMENT)) - data >> mi->t_time2; + data >> mi->transport.time2; - if (mi->pos.m_positionX != mi->t_pos.m_positionX) + if (mi->pos.m_positionX != mi->transport.pos.m_positionX) if (GetPlayer()->GetTransport()) GetPlayer()->GetTransport()->UpdatePosition(mi); } @@ -790,10 +790,10 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo* mi) if (mi->HasMovementFlag(MOVEMENTFLAG_FALLING)) { - data >> mi->j_zspeed; - data >> mi->j_sinAngle; - data >> mi->j_cosAngle; - data >> mi->j_xyspeed; + data >> mi->jump.zspeed; + data >> mi->jump.sinAngle; + data >> mi->jump.cosAngle; + data >> mi->jump.xyspeed; } if (mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION)) @@ -883,14 +883,14 @@ void WorldSession::WriteMovementInfo(WorldPacket* data, MovementInfo* mi) if (mi->HasMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) { - data->appendPackGUID(mi->t_guid); + data->appendPackGUID(mi->transport.guid); - *data << mi->t_pos.PositionXYZOStream(); - *data << mi->t_time; - *data << mi->t_seat; + *data << mi->transport.pos.PositionXYZOStream(); + *data << mi->transport.time; + *data << mi->transport.seat; if (mi->HasExtraMovementFlag(MOVEMENTFLAG2_INTERPOLATED_MOVEMENT)) - *data << mi->t_time2; + *data << mi->transport.time2; } if (mi->HasMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || mi->HasExtraMovementFlag(MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING)) @@ -900,10 +900,10 @@ void WorldSession::WriteMovementInfo(WorldPacket* data, MovementInfo* mi) if (mi->HasMovementFlag(MOVEMENTFLAG_FALLING)) { - *data << mi->j_zspeed; - *data << mi->j_sinAngle; - *data << mi->j_cosAngle; - *data << mi->j_xyspeed; + *data << mi->jump.zspeed; + *data << mi->jump.sinAngle; + *data << mi->jump.cosAngle; + *data << mi->jump.xyspeed; } if (mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION)) |