From 6cd253ff8f45ac1f509a43ddfa3f400fa6251067 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 20 Feb 2017 14:22:49 -0300 Subject: [PATCH] Core/Misc: moved WeaponAttackType definition to SharedDefines to avoid including Unit.h --- src/server/game/Entities/Unit/Unit.h | 8 -------- src/server/game/Miscellaneous/SharedDefines.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index a91d6678f21..915dd3feb2e 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -593,14 +593,6 @@ enum UnitMoveType 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_WEAPON_SKILL = 0, diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 5ac85c8b775..ce80284498e 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4125,4 +4125,12 @@ enum SpellCooldownFlags SPELL_COOLDOWN_FLAG_INCLUDE_EVENT_COOLDOWNS = 0x2 ///< Starts GCD for spells that should start their cooldown on events, requires SPELL_COOLDOWN_FLAG_INCLUDE_GCD set }; +enum WeaponAttackType : uint8 +{ + BASE_ATTACK = 0, + OFF_ATTACK = 1, + RANGED_ATTACK = 2, + MAX_ATTACK +}; + #endif