aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobmaps <spambot42@yandex.ru>2011-05-11 23:20:15 +0700
committertobmaps <spambot42@yandex.ru>2011-05-11 23:20:15 +0700
commit8ecde2f96b2b9a7f6e5cf49f1d16867bb571b886 (patch)
tree93cf225b3dd309ab453df1a176d1d131e9b23ec9
parent7b0db7a4ea36613d376063de1adda481e09a5362 (diff)
Core/Spells: rename MECHANIC_PACIFY to MECHANIC_SLOW_ATTACK and fix a bug with Frost Fever removing by PvP trinket
Closes #457 & #836 & #1195
-rwxr-xr-xsrc/server/game/Miscellaneous/SharedDefines.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 66f059c26c4..4dc42822e5c 100755
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -1186,7 +1186,7 @@ enum Mechanics
MECHANIC_FEAR = 5,
MECHANIC_GRIP = 6,
MECHANIC_ROOT = 7,
- MECHANIC_PACIFY = 8, //0 spells use this mechanic
+ MECHANIC_SLOW_ATTACK = 8,
MECHANIC_SILENCE = 9,
MECHANIC_SLEEP = 10,
MECHANIC_SNARE = 11,
@@ -1212,14 +1212,14 @@ enum Mechanics
MECHANIC_ENRAGED = 31
};
-// Used for spell 42292 Immune Movement Impairment and Loss of Control (0x49967da6)
+// Used for spell 42292 Immune Movement Impairment and Loss of Control (0x49967ca6)
#define IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK (\
(1<<MECHANIC_CHARM)|(1<<MECHANIC_DISORIENTED)|(1<<MECHANIC_FEAR)| \
- (1<<MECHANIC_ROOT)|(1<<MECHANIC_PACIFY)|(1<<MECHANIC_SLEEP)| \
- (1<<MECHANIC_SNARE)|(1<<MECHANIC_STUN)|(1<<MECHANIC_FREEZE)| \
- (1<<MECHANIC_KNOCKOUT)|(1<<MECHANIC_POLYMORPH)|(1<<MECHANIC_BANISH)| \
- (1<<MECHANIC_SHACKLE)|(1<<MECHANIC_TURN)|(1<<MECHANIC_HORROR)| \
- (1<<MECHANIC_DAZE)|(1<<MECHANIC_SAPPED))
+ (1<<MECHANIC_ROOT)|(1<<MECHANIC_SLEEP)|(1<<MECHANIC_SNARE)| \
+ (1<<MECHANIC_STUN)|(1<<MECHANIC_FREEZE)|(1<<MECHANIC_KNOCKOUT)| \
+ (1<<MECHANIC_POLYMORPH)|(1<<MECHANIC_BANISH)|(1<<MECHANIC_SHACKLE)| \
+ (1<<MECHANIC_TURN)|(1<<MECHANIC_HORROR)|(1<<MECHANIC_DAZE)| \
+ (1<<MECHANIC_SAPPED))
// Spell dispell type
enum DispelType