From 73ea9ecec1f29752d515eb8fa22de7e0c9d2ec79 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 20 Feb 2017 14:22:49 -0300 Subject: Core/Misc: moved WeaponAttackType definition to SharedDefines to avoid including Unit.h (cherry picked from commit 6d991e9361fdda66391a7f4774ea908763998074) --- src/server/game/Entities/Unit/Unit.h | 8 -------- src/server/game/Miscellaneous/SharedDefines.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 1f9de500ad1..51815fe7eff 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -430,14 +430,6 @@ enum UnitState TC_GAME_API extern float baseMoveSpeed[MAX_MOVE_TYPE]; TC_GAME_API extern float playerBaseMoveSpeed[MAX_MOVE_TYPE]; -enum WeaponAttackType : uint8 -{ - BASE_ATTACK = 0, - OFF_ATTACK = 1, - RANGED_ATTACK = 2, - MAX_ATTACK -}; - enum CombatRating { CR_AMPLIFY = 0, diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 1edeb4218fe..1002ab50684 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -5392,6 +5392,14 @@ enum DiminishingLevels DIMINISHING_LEVEL_TAUNT_IMMUNE = 4 }; +enum WeaponAttackType : uint8 +{ + BASE_ATTACK = 0, + OFF_ATTACK = 1, + RANGED_ATTACK = 2, + MAX_ATTACK +}; + enum TokenResult { TOKEN_RESULT_SUCCESS = 0, -- cgit v1.2.3