aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2012-04-11 21:30:56 +0200
committerShauren <shauren.trinity@gmail.com>2012-04-11 21:30:56 +0200
commitda8c7d23441467b0da4555fcccf6028a3d9665c1 (patch)
treed5c0b5343244b87ca0f7f56d720b3d2c90270ebc
parentccf50f4c3d583132ac736e0ec44a1ba5ad3c3b32 (diff)
Core: Fixed warning C4263: 'bool Creature::SetDisableGravity(bool,bool)' : member function does not override any base class virtual member function
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp2
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index d5db4ca9714..d49346b232a 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -17565,7 +17565,7 @@ bool Unit::SetWalk(bool enable)
return true;
}
-bool Unit::SetDisableGravity(bool disable)
+bool Unit::SetDisableGravity(bool disable, bool packetOnly /*= false*/)
{
if (disable == IsLevitating())
return false;
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index bb826c14dfc..00d66518d3f 100755
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -707,7 +707,7 @@ enum MovementFlags
MOVEMENTFLAG_MASK_TURNING =
MOVEMENTFLAG_LEFT | MOVEMENTFLAG_RIGHT,
- MOVEMENTFLAG_MASK_MOVING_FLY =
+ MOVEMENTFLAG_MASK_MOVING_FLY =
MOVEMENTFLAG_FLYING | MOVEMENTFLAG_ASCENDING | MOVEMENTFLAG_DESCENDING,
//! TODO if needed: add more flags to this masks that are exclusive to players
@@ -1647,7 +1647,7 @@ class Unit : public WorldObject
bool IsLevitating() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_DISABLE_GRAVITY);}
bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING);}
virtual bool SetWalk(bool enable);
- virtual bool SetDisableGravity(bool disable);
+ virtual bool SetDisableGravity(bool disable, bool packetOnly = false);
bool SetHover(bool enable);
void SetInFront(Unit const* target);