aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <none@none>2009-07-06 17:41:45 +0200
committerQAston <none@none>2009-07-06 17:41:45 +0200
commit855c0dc3b21c875338c772b7532f228b8702b21b (patch)
tree2b4f2eae3bf59592397d60e36c1a0f7d3a5e2732 /src
parent7d39f4ab22d514a12450ee68d962ef6d510334bc (diff)
[8134] Fixed typo in ACTION_T_MORPH_TO_ENTRY_OR_MODEL check. Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/CreatureEventAIMgr.cpp3
-rw-r--r--src/game/SharedDefines.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp
index 38cc84177e4..18db935536b 100644
--- a/src/game/CreatureEventAIMgr.cpp
+++ b/src/game/CreatureEventAIMgr.cpp
@@ -473,9 +473,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
action.morph.modelId = 0;
}
}
-
- break;
}
+ break;
case ACTION_T_SOUND:
if (!sSoundEntriesStore.LookupEntry(action.sound.soundId))
sLog.outErrorDb("CreatureEventAI: Event %u Action %u uses non-existant SoundID %u.", i, j+1, action.sound.soundId);
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 35e16f9d6bf..4916f1030d8 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -251,6 +251,7 @@ enum SpellCategory
#define SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY 0x20000000 // 29 unaffected by invulnerability (hmm possible not...)
#define SPELL_ATTR_BREAKABLE_BY_DAMAGE 0x40000000 // 30 breakable by damage?
#define SPELL_ATTR_CANT_CANCEL 0x80000000 // 31 positive aura can't be canceled
+
#define SPELL_ATTR_EX_DISMISS_PET 0x00000001 // 0 dismiss pet and not allow to summon new one?
#define SPELL_ATTR_EX_DRAIN_ALL_POWER 0x00000002 // 1 use all power (Only paladin Lay of Hands and Bunyanize)
#define SPELL_ATTR_EX_CHANNELED_1 0x00000004 // 2 channeled target