aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2015-01-18 23:56:01 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2015-01-18 23:56:01 +0100
commitfd6668d17a12704187f4fa3ab30efbee3ebbfe5a (patch)
treea51d0cd333456db9b746af42afe3a73b7c299d24 /src/server/game/Movement
parent1a4b1beb141182bd050ed8fa1220597e8ed837a8 (diff)
Core/NetworkIO: sync opcode values with wpp and removed duplicate ones
Diffstat (limited to 'src/server/game/Movement')
-rw-r--r--src/server/game/Movement/MovementStructures.cpp12
-rw-r--r--src/server/game/Movement/MovementStructures.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp
index 841f739ff09..edbbed3a343 100644
--- a/src/server/game/Movement/MovementStructures.cpp
+++ b/src/server/game/Movement/MovementStructures.cpp
@@ -5294,9 +5294,9 @@ MovementStatusElements const* GetMovementStatusElementsSequence(uint32 opcode)
return DismissControlledVehicle;
case SMSG_MOVE_UPDATE_TELEPORT:
return MoveUpdateTeleport;
- case CMSG_FORCE_MOVE_ROOT_ACK:
+ case CMSG_MOVE_FORCE_ROOT_ACK:
return ForceMoveRootAck;
- case CMSG_FORCE_MOVE_UNROOT_ACK:
+ case CMSG_MOVE_FORCE_UNROOT_ACK:
return ForceMoveUnrootAck;
case CMSG_MOVE_FALL_RESET:
return MovementFallReset;
@@ -5426,13 +5426,13 @@ MovementStatusElements const* GetMovementStatusElementsSequence(uint32 opcode)
return MoveSetHover;
case SMSG_MOVE_UNSET_HOVER:
return MoveUnsetHover;
- case SMSG_MOVE_WATER_WALK:
+ case SMSG_MOVE_SET_WATER_WALK:
return MoveWaterWalk;
- case SMSG_MOVE_LAND_WALK:
+ case SMSG_MOVE_SET_LAND_WALK:
return MoveLandWalk;
- case SMSG_MOVE_FEATHER_FALL:
+ case SMSG_MOVE_SET_FEATHER_FALL:
return MoveFeatherFall;
- case SMSG_MOVE_NORMAL_FALL:
+ case SMSG_MOVE_SET_NORMAL_FALL:
return MoveNormalFall;
case SMSG_MOVE_ROOT:
return MoveRoot;
diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h
index afa30b4c1c7..96d85a6fd0e 100644
--- a/src/server/game/Movement/MovementStructures.h
+++ b/src/server/game/Movement/MovementStructures.h
@@ -139,7 +139,7 @@ namespace Movement
class PacketSender
{
public:
- PacketSender(Unit* unit, OpcodeServer serverControl, OpcodeServer playerControl, OpcodeServer broadcast = SMSG_PLAYER_MOVE, ExtraMovementStatusElement* extras = NULL);
+ PacketSender(Unit* unit, OpcodeServer serverControl, OpcodeServer playerControl, OpcodeServer broadcast = SMSG_MOVE_UPDATE, ExtraMovementStatusElement* extras = NULL);
void Send() const;