From 314ed447ce2d314112cab9a00778658db18a7804 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sat, 5 Jun 2010 00:20:02 +0400 Subject: [PATCH] [10029] Clarify client dependence for some MeleeHitOutcome values --- src/game/Unit.h | 12 ++++++++++-- src/shared/revision_nr.h | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/game/Unit.h b/src/game/Unit.h index 9f5440fdb..141c8a66a 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -838,10 +838,18 @@ struct DiminishingReturn uint32 hitCount; }; +// At least some values expected fixed and used in auras field, other custom enum MeleeHitOutcome { - MELEE_HIT_EVADE, MELEE_HIT_MISS, MELEE_HIT_DODGE, MELEE_HIT_BLOCK, MELEE_HIT_PARRY, - MELEE_HIT_GLANCING, MELEE_HIT_CRIT, MELEE_HIT_CRUSHING, MELEE_HIT_NORMAL + MELEE_HIT_EVADE = 0, + MELEE_HIT_MISS = 1, + MELEE_HIT_DODGE = 2, // used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT + MELEE_HIT_BLOCK = 3, // used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT + MELEE_HIT_PARRY = 4, // used as misc in SPELL_AURA_IGNORE_COMBAT_RESULT + MELEE_HIT_GLANCING = 5, + MELEE_HIT_CRIT = 6, + MELEE_HIT_CRUSHING = 7, + MELEE_HIT_NORMAL = 8, }; struct CleanDamage diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 7f993ed97..90f08bd0f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10028" + #define REVISION_NR "10029" #endif // __REVISION_NR_H__ -- 2.11.4.GIT