diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-02-20 14:22:49 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-02-20 14:22:49 -0300 |
| commit | 6d991e9361fdda66391a7f4774ea908763998074 (patch) | |
| tree | 562a46c96b01207053b43fce1161930f8e832dee /src | |
| parent | 0d3e1606a931f015f6a8f936293f2d0518cd8c93 (diff) | |
Core/Misc: moved WeaponAttackType definition to SharedDefines to avoid including Unit.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 8 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.h | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 2f953c453e6..12b2be85e03 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -588,14 +588,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 9c0d09edaed..1d3f44a6ddd 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -3585,4 +3585,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 diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 71982eafaf5..31bf975428c 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -23,7 +23,6 @@ #include "DBCStructure.h" #include "Object.h" #include "SpellAuraDefines.h" -#include "Unit.h" #include <boost/container/flat_set.hpp> |