diff options
| author | kaelima <kaelima@live.se> | 2012-05-30 09:22:56 +0200 |
|---|---|---|
| committer | kaelima <kaelima@live.se> | 2012-05-30 09:22:56 +0200 |
| commit | 774f3cdc9b2861f0ba2bf496a8528e41f0f578c3 (patch) | |
| tree | 8de17fe0abd756fdd42515d175d1b40b638a0357 /src/server/game/Handlers/MovementHandler.cpp | |
| parent | f40e0d0a9a9e5b43379772f84ea92ea84cedc7d4 (diff) | |
Fixed some merging errors, there could be more, but at least it compiles.
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/MovementHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 3d9968d9a9d..592b2cbeff6 100755 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -345,7 +345,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData) /*----------------------*/ /* process position-change */ - WorldPacket data(SMSG_PLAYER_MOVE, recv_data.size()); + WorldPacket data(SMSG_PLAYER_MOVE, recvData.size()); movementInfo.time = getMSTime(); movementInfo.guid = mover->GetGUID(); WriteMovementInfo(data, &movementInfo); @@ -824,7 +824,7 @@ void WorldSession::WriteMovementInfo(WorldPacket &data, MovementInfo* mi) HavePitch = (mi->HasMovementFlag(MovementFlags(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING))) || (mi->flags2 & MOVEMENTFLAG2_ALWAYS_ALLOW_PITCHING), HaveFallData = mi->HasExtraMovementFlag(MOVEMENTFLAG2_INTERPOLATED_TURNING), - HaveFallDirection = mi->HasMovementFlag(MOVEMENTFLAG_JUMPING), + HaveFallDirection = mi->HasMovementFlag(MOVEMENTFLAG_FALLING), HaveSplineElevation = mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION), HaveSpline = false; |