Core/Movement: Fixes getting wrong speedtype

This commit is contained in:
hondacrx
2018-06-15 12:39:08 -04:00
parent daf0a5c0ab
commit 1be8f0a70a
+6 -6
View File
@@ -42,25 +42,25 @@ namespace Game.Movement
UnitMoveType SelectSpeedType(MovementFlag moveFlags) UnitMoveType SelectSpeedType(MovementFlag moveFlags)
{ {
if (Convert.ToBoolean(moveFlags & (MovementFlag.Flying | MovementFlag.CanFly | MovementFlag.DisableGravity))) if (moveFlags.HasAnyFlag(MovementFlag.Flying))
{ {
if (Convert.ToBoolean(moveFlags & MovementFlag.Backward)) if (moveFlags.HasAnyFlag(MovementFlag.Backward))
return UnitMoveType.FlightBack; return UnitMoveType.FlightBack;
else else
return UnitMoveType.Flight; return UnitMoveType.Flight;
} }
else if (Convert.ToBoolean(moveFlags & MovementFlag.Swimming)) else if (moveFlags.HasAnyFlag(MovementFlag.Swimming))
{ {
if (Convert.ToBoolean(moveFlags & MovementFlag.Backward)) if (moveFlags.HasAnyFlag(MovementFlag.Backward))
return UnitMoveType.SwimBack; return UnitMoveType.SwimBack;
else else
return UnitMoveType.Swim; return UnitMoveType.Swim;
} }
else if (Convert.ToBoolean(moveFlags & MovementFlag.Walking)) else if (moveFlags.HasAnyFlag(MovementFlag.Walking))
{ {
return UnitMoveType.Walk; return UnitMoveType.Walk;
} }
else if (Convert.ToBoolean(moveFlags & MovementFlag.Backward)) else if (moveFlags.HasAnyFlag(MovementFlag.Backward))
return UnitMoveType.RunBack; return UnitMoveType.RunBack;
// Flying creatures use MOVEMENTFLAG_CAN_FLY or MOVEMENTFLAG_DISABLE_GRAVITY // Flying creatures use MOVEMENTFLAG_CAN_FLY or MOVEMENTFLAG_DISABLE_GRAVITY