Fix: Correct enum initialization phase value
Patch by Vladmimír Lipták

--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-11-27 05:07:03 +01:00
parent 1690af7c58
commit fef51c65bf
12 changed files with 25 additions and 10 deletions

View File

@@ -46,7 +46,8 @@ enum Spells
enum Events
{
EVENT_POISON = 1,
EVENT_NONE,
EVENT_POISON,
EVENT_FIRE,
EVENT_FRENZY,
EVENT_AFTERENRAGE

View File

@@ -27,7 +27,8 @@ enum Horsemen
enum Events
{
EVENT_MARK = 1,
EVENT_NONE,
EVENT_MARK,
EVENT_CAST,
EVENT_BERSERK,
};

View File

@@ -34,7 +34,8 @@ const Position PosSummon[3] =
enum Events
{
EVENT_WOUND = 1,
EVENT_NONE,
EVENT_WOUND,
EVENT_ENRAGE,
EVENT_DECIMATE,
EVENT_BERSERK,

View File

@@ -108,7 +108,8 @@ const Waves wavesHeroic[] =
enum Events
{
EVENT_SUMMON = 1,
EVENT_NONE,
EVENT_SUMMON,
EVENT_HARVEST,
EVENT_BOLT,
};

View File

@@ -28,7 +28,8 @@
enum Events
{
EVENT_DISRUPT = 1,
EVENT_NONE,
EVENT_DISRUPT,
EVENT_FEVER,
EVENT_ERUPT,
EVENT_PHASE,

View File

@@ -56,6 +56,7 @@ enum Yells
};
enum Event
{
EVENT_NONE,
EVENT_BOLT,
EVENT_NOVA,
EVENT_CHAIN,

View File

@@ -31,6 +31,7 @@ enum Spells
enum Events
{
EVENT_NONE,
EVENT_AURA,
EVENT_BLOOM,
EVENT_DOOM,

View File

@@ -38,7 +38,8 @@ const float PosWrap[MAX_POS_WRAP][3] =
enum Events
{
EVENT_SPRAY = 1,
EVENT_NONE,
EVENT_SPRAY,
EVENT_SHOCK,
EVENT_POISON,
EVENT_WRAP,

View File

@@ -52,7 +52,8 @@ const float SummonPos[MAX_SUMMON_POS][4] =
enum Events
{
EVENT_BERSERK = 1,
EVENT_NONE,
EVENT_BERSERK,
EVENT_CURSE,
EVENT_BLINK,
EVENT_WARRIOR,

View File

@@ -46,6 +46,7 @@
enum Events
{
EVENT_NONE,
EVENT_STRIKE,
EVENT_SHOUT,
EVENT_KNIFE,

View File

@@ -52,7 +52,8 @@ enum Phases
enum Events
{
EVENT_BERSERK = 1,
EVENT_NONE,
EVENT_BERSERK,
EVENT_CLEAVE,
EVENT_TAIL,
EVENT_DRAIN,

View File

@@ -77,7 +77,8 @@ enum ThaddiusSpells
enum Events
{
EVENT_SHIFT = 1,
EVENT_NONE,
EVENT_SHIFT,
EVENT_CHAIN,
EVENT_BERSERK,
};
@@ -90,6 +91,7 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI
boss_thaddiusAI(Creature *c) : BossAI(c, BOSS_THADDIUS)
{
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
me->SetReactState(REACT_PASSIVE);
}
void KilledUnit(Unit* victim)
@@ -115,8 +117,10 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI
void UpdateAI(const uint32 diff)
{
if (CheckStalaggAlive == false && CheckFeugenAlive == false)
if (CheckStalaggAlive == false && CheckFeugenAlive == false) {
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
me->SetReactState(REACT_AGGRESSIVE);
}
if (!UpdateVictim())
return;