diff options
Diffstat (limited to 'src/server/scripts/Northrend')
7 files changed, 8 insertions, 9 deletions
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 900113b3017..ba6fcfdae12 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -78,6 +78,7 @@ enum eSeat SEAT_ID_0 = 0 }; +/* struct Point { float x,y,z; @@ -89,7 +90,7 @@ const Point MovementPoint[] = {747.96f,620.29f,411.09f}, {750.23f,618.35f,411.09f} }; - +*/ void AggroAllPlayers(Creature* pTemp) { Map::PlayerList const &PlList = pTemp->GetMap()->GetPlayers(); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 372cb70572b..3822265b2f6 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -275,9 +275,7 @@ struct boss_faction_championsAI : public ScriptedAI void UpdateThreat() { std::list<HostileReference*> const& tList = me->getThreatManager().getThreatList(); - std::list<HostileReference*>::const_iterator itr; - bool empty = true; - for (itr = tList.begin(); itr!=tList.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = tList.begin(); itr != tList.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*me), (*itr)->getUnitGuid()); if (pUnit && me->getThreatManager().getThreat(pUnit)) @@ -287,7 +285,6 @@ struct boss_faction_championsAI : public ScriptedAI float threat = CalculateThreat(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth()); me->getThreatManager().modifyThreatPercent(pUnit, -100); me->AddThreat(pUnit, 1000000.0f * threat); - empty = false; } } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 0f426a3d959..34bee4908d8 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -452,6 +452,7 @@ struct boss_jormungarAI : public ScriptedAI case 4: m_uiStage = 5; m_uiSubmergeTimer = 5*IN_MILLISECONDS; + break; default: m_uiStage = 7; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index f46ed746c97..7aa4b0a9acd 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -384,7 +384,7 @@ public: void UpdateAI(const uint32 diff) { - if (!UpdateCombatState() || !CheckInRoom()) + if (!UpdateVictim() || !CheckInRoom()) return; events.Update(diff); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index e4a121aa2ae..158e19843d9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -377,7 +377,7 @@ public: void UpdateAI(const uint32 diff) { - if (!UpdateCombatState()) + if (!UpdateVictim()) return; events.Update(diff); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 135473a2ea4..2010173de89 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -142,7 +142,7 @@ public: void UpdateAI(const uint32 diff) { - if (!UpdateCombatState() || !CheckInRoom()) + if (!UpdateVictim() || !CheckInRoom()) return; events.Update(diff); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 3ed263ffae5..e48696f23bc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -228,7 +228,7 @@ public: events.Update(diff); - if ((phase != PHASE_BIRTH && !UpdateCombatState()) || !CheckInRoom()) + if ((phase != PHASE_BIRTH && !UpdateVictim()) || !CheckInRoom()) return; if (CanTheHundredClub) |