diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2017-07-30 14:58:42 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-07-30 14:58:42 +0200 |
| commit | 43c3a780798268c2fc2d9163a9d8bd24624b8c35 (patch) | |
| tree | 9e5796cefda5f94f1b2aefc215af3f853b4cf6b0 /src/server/game | |
| parent | 6f8b60101f9e49bfd5edc030fdead98d4e67e300 (diff) | |
Core/LFG: Fixed role check cancel time
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 39 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/UnitDefines.h | 46 |
3 files changed, 47 insertions, 40 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 10eaca4a8b3..3d616bcecc8 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -51,7 +51,7 @@ enum LfgOptions enum LFGMgrEnum { - LFG_TIME_ROLECHECK = 45 * IN_MILLISECONDS, + LFG_TIME_ROLECHECK = 45, LFG_TIME_BOOT = 120, LFG_TIME_PROPOSAL = 45, LFG_QUEUEUPDATE_INTERVAL = 15 * IN_MILLISECONDS, diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 0bfc51f5c12..44526ba491e 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -203,45 +203,6 @@ enum SpellFacingFlags SPELL_FACING_FLAG_INFRONT = 0x0001 }; -// high byte (3 from 0..3) of UNIT_FIELD_BYTES_2 -enum ShapeshiftForm -{ - FORM_NONE = 0, - FORM_CAT_FORM = 1, - FORM_TREE_OF_LIFE = 2, - FORM_TRAVEL_FORM = 3, - FORM_AQUATIC_FORM = 4, - FORM_BEAR_FORM = 5, - FORM_AMBIENT = 6, - FORM_GHOUL = 7, - FORM_DIRE_BEAR_FORM = 8, - FORM_CRANE_STANCE = 9, - FORM_THARONJA_SKELETON = 10, - FORM_DARKMOON_TEST_OF_STRENGTH = 11, - FORM_BLB_PLAYER = 12, - FORM_SHADOW_DANCE = 13, - FORM_CREATURE_BEAR = 14, - FORM_CREATURE_CAT = 15, - FORM_GHOST_WOLF = 16, - FORM_BATTLE_STANCE = 17, - FORM_DEFENSIVE_STANCE = 18, - FORM_BERSERKER_STANCE = 19, - FORM_SERPENT_STANCE = 20, - FORM_ZOMBIE = 21, - FORM_METAMORPHOSIS = 22, - FORM_OX_STANCE = 23, - FORM_TIGER_STANCE = 24, - FORM_UNDEAD = 25, - FORM_FRENZY = 26, - FORM_FLIGHT_FORM_EPIC = 27, - FORM_SHADOWFORM = 28, - FORM_FLIGHT_FORM = 29, - FORM_STEALTH = 30, - FORM_MOONKIN_FORM = 31, - FORM_SPIRIT_OF_REDEMPTION = 32, - FORM_GLADIATOR_STANCE = 33 -}; - #define MAX_SPELL_CHARM 4 #define MAX_SPELL_VEHICLE 6 #define MAX_SPELL_POSSESS 8 diff --git a/src/server/game/Entities/Unit/UnitDefines.h b/src/server/game/Entities/Unit/UnitDefines.h index 3552ca4dea4..c023442e30f 100644 --- a/src/server/game/Entities/Unit/UnitDefines.h +++ b/src/server/game/Entities/Unit/UnitDefines.h @@ -120,6 +120,52 @@ enum UnitRename : uint8 UNIT_CAN_BE_ABANDONED = 0x02 }; +// high byte (3 from 0..3) of UNIT_FIELD_BYTES_2 +enum ShapeshiftForm +{ + FORM_NONE = 0, + FORM_CAT_FORM = 1, + FORM_TREE_OF_LIFE = 2, + FORM_TRAVEL_FORM = 3, + FORM_AQUATIC_FORM = 4, + FORM_BEAR_FORM = 5, + FORM_AMBIENT = 6, + FORM_GHOUL = 7, + FORM_DIRE_BEAR_FORM = 8, + FORM_CRANE_STANCE = 9, + FORM_THARONJA_SKELETON = 10, + FORM_DARKMOON_TEST_OF_STRENGTH = 11, + FORM_BLB_PLAYER = 12, + FORM_SHADOW_DANCE = 13, + FORM_CREATURE_BEAR = 14, + FORM_CREATURE_CAT = 15, + FORM_GHOST_WOLF = 16, + FORM_BATTLE_STANCE = 17, + FORM_DEFENSIVE_STANCE = 18, + FORM_BERSERKER_STANCE = 19, + FORM_SERPENT_STANCE = 20, + FORM_ZOMBIE = 21, + FORM_METAMORPHOSIS = 22, + FORM_OX_STANCE = 23, + FORM_TIGER_STANCE = 24, + FORM_UNDEAD = 25, + FORM_FRENZY = 26, + FORM_FLIGHT_FORM_EPIC = 27, + FORM_SHADOWFORM = 28, + FORM_FLIGHT_FORM = 29, + FORM_STEALTH = 30, + FORM_MOONKIN_FORM = 31, + FORM_SPIRIT_OF_REDEMPTION = 32, + FORM_GLADIATOR_STANCE = 33, + FORM_METAMORPHOSIS_2 = 34, + FORM_MOONKIN_FORM_RESTORATION = 35, + FORM_TREANT_FORM = 36, + FORM_SPIRIT_OWL_FORM = 37, + FORM_SPIRIT_OWL_FORM_2 = 38, + FORM_WISP_FORM = 39, + FORM_WISP_FORM_2 = 40, +}; + // Value masks for UNIT_FIELD_FLAGS enum UnitFlags : uint32 { |