aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2013-08-25 14:38:48 +0100
committerNay <dnpd.dd@gmail.com>2013-08-25 14:38:48 +0100
commitd9a136fd58ff09cf6e3020c5b06035ac772fc1f3 (patch)
treed6280ba0892a734f2cc2a07ea53aa1c62347e6e4 /src
parent2c35479847d840811139b6eb0f96f91fa463fde8 (diff)
Scripts/Commands: Revert changes to cs_debug; fixes build
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Commands/cs_debug.cpp30
1 files changed, 2 insertions, 28 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 604ad76f46c..535d14bc326 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -1323,35 +1323,9 @@ public:
char* mask2 = strtok(NULL, " \n");
uint32 moveFlags = (uint32)atoi(mask1);
+ target->SetUnitMovementFlags(moveFlags);
- static uint32 const FlagsWithHandlers = MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE |
- MOVEMENTFLAG_WALKING | MOVEMENTFLAG_SWIMMING |
- MOVEMENTFLAG_SPLINE_ENABLED;
-
- bool unhandledFlag = (moveFlags ^ target->GetUnitMovementFlags()) & ~FlagsWithHandlers;
-
- target->SetWalk(moveFlags & MOVEMENTFLAG_WALKING);
- target->SetDisableGravity(moveFlags & MOVEMENTFLAG_DISABLE_GRAVITY);
- target->SetSwim(moveFlags & MOVEMENTFLAG_SWIMMING);
- target->SetCanFly(moveFlags & MOVEMENTFLAG_CAN_FLY);
- target->SetWaterWalking(moveFlags & MOVEMENTFLAG_WATERWALKING);
- target->SetFeatherFall(moveFlags & MOVEMENTFLAG_FALLING_SLOW);
- target->SetHover(moveFlags & MOVEMENTFLAG_HOVER);
-
- if (moveFlags & (MOVEMENTFLAG_DISABLE_GRAVITY | MOVEMENTFLAG_CAN_FLY))
- moveFlags &= ~MOVEMENTFLAG_FALLING;
-
- if (moveFlags & MOVEMENTFLAG_ROOT)
- {
- target->SetControlled(true, UNIT_STATE_ROOT);
- moveFlags &= ~MOVEMENTFLAG_MASK_MOVING;
- }
-
- if (target->HasUnitMovementFlag(MOVEMENTFLAG_SPLINE_ENABLED) && !(moveFlags & MOVEMENTFLAG_SPLINE_ENABLED))
- target->StopMoving();
-
- if (unhandledFlag)
- target->SetUnitMovementFlags(moveFlags);
+ /// @fixme: port master's HandleDebugMoveflagsCommand; flags need different handling
if (mask2)
{