diff options
Diffstat (limited to 'src')
85 files changed, 289 insertions, 256 deletions
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp index 20ebe58b7db..ccee79d83d5 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp @@ -230,7 +230,7 @@ struct boss_chromaggusAI : public ScriptedAI if (Affliction_Timer <= diff) { std::list<HostileReference*> threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator i = threatlist.begin(); i != threatlist.end(); ++i) + for (std::list<HostileReference*>::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) { Unit* pUnit; if ((*i) && (*i)->getSource()) diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp index 8d841e71011..c6cc0f7ad36 100644 --- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp @@ -189,7 +189,7 @@ struct boss_victor_nefariusAI : public ScriptedAI //Trinity::Singleton<MapManager>::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin(); /* - list <Player*>::iterator i = MapManager::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin(); + list <Player*>::const_iterator i = MapManager::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin(); for (i = MapManager::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().begin(); i != MapManager::Instance().GetMap(m_creature->GetMapId(), m_creature)->GetPlayers().end(); ++i) { diff --git a/src/scripts/eastern_kingdoms/eversong_woods.cpp b/src/scripts/eastern_kingdoms/eversong_woods.cpp index b8e81fd95f3..5ba6084a97d 100644 --- a/src/scripts/eastern_kingdoms/eversong_woods.cpp +++ b/src/scripts/eastern_kingdoms/eversong_woods.cpp @@ -377,7 +377,7 @@ struct master_kelerun_bloodmournAI : public ScriptedAI for (uint8 i = 0; i < 4; ++i) if (Creature *pSummoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000)) - paladinGuid[i] = pSummoned->GetGUID(); + paladinGuid[i] = pSummoned->GetGUID(); timer = OFFSET_NEXT_ATTACK; questPhase = 2; diff --git a/src/scripts/eastern_kingdoms/ghostlands.cpp b/src/scripts/eastern_kingdoms/ghostlands.cpp index 91bdca62fe6..5087ceb8da5 100644 --- a/src/scripts/eastern_kingdoms/ghostlands.cpp +++ b/src/scripts/eastern_kingdoms/ghostlands.cpp @@ -155,8 +155,6 @@ struct npc_ranger_lilathaAI : public npc_escortAI { npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {} - std::list<GameObject*> CageList; - void WaypointReached(uint32 i) { Player* pPlayer = GetPlayerForEscort(); diff --git a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp index fd8d34d0bbd..08ab2c2830c 100644 --- a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp @@ -131,7 +131,7 @@ struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI if (GoSummonList.empty()) return; - for(std::list<uint64>::iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) { if (GameObject* pGo = GameObject::GetGameObject(*m_creature, *itr)) { @@ -186,14 +186,14 @@ struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI pInstance->HandleGameObject(NULL,false,pGo); if (!GoSummonList.empty()) - for(std::list<uint64>::iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = GoSummonList.begin(); itr != GoSummonList.end(); ++itr) { if (GameObject* pGo = GameObject::GetGameObject(*m_creature, *itr)) pGo->RemoveFromWorld(); } if (!SummonList.empty()) - for(std::list<uint64>::iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { if (Creature* pSummon = Unit::GetCreature(*m_creature, *itr)) { diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp index 48a6ecf5412..218f094f4c4 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp @@ -246,7 +246,7 @@ struct boss_attumenAI : public ScriptedAI Unit *pTarget; std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && !pTarget->IsWithinDist(m_creature, ATTACK_DISTANCE, false)) diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp index 48573456f9a..b6cac656fa9 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp @@ -153,7 +153,7 @@ struct boss_moroesAI : public ScriptedAI AddList.erase((AddList.begin())+(rand()%AddList.size())); uint8 i = 0; - for (std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr) + for (std::vector<uint32>::const_iterator itr = AddList.begin(); itr != AddList.end(); ++itr) { uint32 entry = *itr; @@ -274,7 +274,7 @@ struct boss_moroesAI : public ScriptedAI { std::list<Unit*> pTargets; SelectTargetList(pTargets, 5, SELECT_TARGET_RANDOM, m_creature->GetMeleeReach()*5, true); - for (std::list<Unit*>::iterator i = pTargets.begin(); i != pTargets.end(); ++i) + for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) if(!m_creature->IsWithinMeleeRange(*i)) { DoCast(*i, SPELL_BLIND); diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp index b9217b5a305..edca9658e5e 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp @@ -242,7 +242,7 @@ struct boss_malchezaarAI : public ScriptedAI void InfernalCleanup() { //Infernal Cleanup - for (std::vector<uint64>::iterator itr = infernals.begin(); itr != infernals.end(); ++itr) + for (std::vector<uint64>::const_iterator itr = infernals.begin(); itr != infernals.end(); ++itr) if (Unit *pInfernal = Unit::GetUnit(*m_creature, *itr)) if (pInfernal->isAlive()) { @@ -288,7 +288,7 @@ struct boss_malchezaarAI : public ScriptedAI return; //begin + 1, so we don't target the one with the highest threat - std::list<HostileReference *>::iterator itr = t_list.begin(); + std::list<HostileReference *>::const_iterator itr = t_list.begin(); std::advance(itr, 1); for (; itr != t_list.end(); ++itr) //store the threat list in a different container if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) @@ -300,7 +300,7 @@ struct boss_malchezaarAI : public ScriptedAI targets.erase(targets.begin()+rand()%targets.size()); uint32 i = 0; - for (std::vector<Unit *>::iterator iter = targets.begin(); iter != targets.end(); ++iter, ++i) + for (std::vector<Unit *>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter, ++i) if (Unit *pTarget = *iter) { enfeeble_targets[i] = pTarget->GetGUID(); diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp index 07128968456..0a1b431aa74 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp @@ -181,7 +181,7 @@ struct boss_aranAI : public ScriptedAI return; //store the threat list in a different container - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //only on alive players @@ -194,7 +194,7 @@ struct boss_aranAI : public ScriptedAI targets.erase(targets.begin()+rand()%targets.size()); uint32 i = 0; - for (std::vector<Unit*>::iterator itr = targets.begin(); itr!= targets.end(); ++itr) + for (std::vector<Unit*>::const_iterator itr = targets.begin(); itr!= targets.end(); ++itr) { if (*itr) { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp index acbd94e57d7..35a0dea71e5 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp @@ -178,7 +178,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI return; std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostileReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -196,7 +196,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI float y = KaelLocations[0][1]; m_creature->GetMap()->CreatureRelocation(m_creature, x, y, LOCATION_Z, 0.0f); //m_creature->SendMonsterMove(x, y, LOCATION_Z, 0, 0, 0); // causes some issues... - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -208,7 +208,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI void CastGravityLapseKnockUp() { - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -220,7 +220,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI void CastGravityLapseFly() // Use Fly Packet hack for now as players can't cast "fly" spells unless in map 530. Has to be done a while after they get knocked into the air... { - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); @@ -240,7 +240,7 @@ struct boss_felblood_kaelthasAI : public ScriptedAI void RemoveGravityLapse() { - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp index c84879d5720..6383df31bdc 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp @@ -172,7 +172,7 @@ struct boss_priestess_delrissaAI : public ScriptedAI LackeyEntryList.erase(LackeyEntryList.begin() + rand()%LackeyEntryList.size()); //summon all the remaining in vector - for (std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr) + for (std::vector<uint32>::const_iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr) { if (Creature* pAdd = m_creature->SummonCreature((*itr), LackeyLocations[j][0], LackeyLocations[j][1], fZLocation, fOrientation, TEMPSUMMON_CORPSE_DESPAWN, 0)) m_auiLackeyGUID[j] = pAdd->GetGUID(); @@ -182,7 +182,7 @@ struct boss_priestess_delrissaAI : public ScriptedAI } else { - for (std::vector<uint32>::iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr) + for (std::vector<uint32>::const_iterator itr = LackeyEntryList.begin(); itr != LackeyEntryList.end(); ++itr) { Unit* pAdd = Unit::GetUnit(*m_creature, m_auiLackeyGUID[j]); @@ -797,7 +797,7 @@ struct boss_yazzaiAI : public boss_priestess_lackey_commonAI { bool InMeleeRange = false; std::list<HostileReference*>& t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { @@ -877,7 +877,7 @@ struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI { bool InMeleeRange = false; std::list<HostileReference*>& t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { if (Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { @@ -1124,7 +1124,7 @@ struct boss_apokoAI : public boss_priestess_lackey_commonAI if (Healing_Wave_Timer <= diff) { - // std::vector<Add*>::iterator itr = Group.begin() + rand()%Group.size(); + // std::vector<Add*>::const_iterator itr = Group.begin() + rand()%Group.size(); // uint64 guid = (*itr)->guid; // if (guid) // { diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp index 79b92eaa3a5..9b8066708c0 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp @@ -89,7 +89,7 @@ struct boss_selin_fireheartAI : public ScriptedAI if (pInstance) { //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i) - for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) + for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) { //Unit* pUnit = Unit::GetUnit(*m_creature, FelCrystals[i]); Unit* pUnit = Unit::GetUnit(*m_creature, *itr); @@ -132,7 +132,7 @@ struct boss_selin_fireheartAI : public ScriptedAI Unit* pCrystal = NULL; Unit* CrystalChosen = NULL; //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i) - for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) + for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) { pCrystal = NULL; //pCrystal = Unit::GetUnit(*m_creature, FelCrystals[i]); @@ -169,7 +169,7 @@ struct boss_selin_fireheartAI : public ScriptedAI return; //for (uint8 i = 0; i < CRYSTALS_NUMBER; ++i) - for (std::list<uint64>::iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) + for (std::list<uint64>::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) { //Creature* pCrystal = (Unit::GetCreature(*m_creature, FelCrystals[i])); Creature* pCrystal = Unit::GetCreature(*m_creature, *itr); diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp index a501cef391d..3a8d5636cb4 100644 --- a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp @@ -41,7 +41,7 @@ struct instance_magisters_terrace : public ScriptedInstance uint32 DelrissaDeathCount; std::list<uint64> FelCrystals; - std::list<uint64>::iterator CrystalItr; + std::list<uint64>::const_iterator CrystalItr; uint64 SelinGUID; uint64 DelrissaGUID; diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp index 8fa89d97b54..1948a3d57e6 100644 --- a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp @@ -77,7 +77,7 @@ struct boss_sulfuronAI : public ScriptedAI std::list<Creature*> pList = DoFindFriendlyMissingBuff(45.0f,SPELL_INSPIRE); if (!pList.empty()) { - std::list<Creature*>::iterator i = pList.begin(); + std::list<Creature*>::const_iterator i = pList.begin(); advance(i, (rand()%pList.size())); pTarget = (*i); } diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp index 9ae7d602ffc..c0c1244c91c 100644 --- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp @@ -735,7 +735,7 @@ struct npc_scarlet_ghoulAI : public ScriptedAI if (!MinionList.empty()) { - for (std::list<Creature*>::iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = MinionList.begin(); itr != MinionList.end(); ++itr) { if (CAST_CRE(*itr)->GetOwner()->GetGUID() == m_creature->GetOwner()->GetGUID()) { diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp index 36863d5f3ca..563224c7384 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp @@ -504,7 +504,7 @@ struct boss_headless_horsemanAI : public ScriptedAI if (PlayerList.isEmpty()) return NULL; std::list<Player*> temp; - std::list<Player*>::iterator j; + std::list<Player*>::const_iterator j; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if ((m_creature->IsWithinLOSInMap(i->getSource()) || !checkLoS) && m_creature->getVictim() != i->getSource() && @@ -559,7 +559,7 @@ struct boss_headless_horsemanAI : public ScriptedAI caster->GetMotionMaster()->Clear(false); caster->GetMotionMaster()->MoveFollow(m_creature,6,urand(0,5)); //DoResetThreat();//not sure if need - std::list<HostileReference*>::iterator itr; + std::list<HostileReference*>::const_iterator itr; for (itr = caster->getThreatManager().getThreatList().begin(); itr != caster->getThreatManager().getThreatList().end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp index 53dcfba5fe5..f3031280773 100644 --- a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp @@ -103,7 +103,7 @@ struct instance_scarlet_monastery : public ScriptedInstance m_auiEncounter[1] = data; if (data == DONE) { - for (std::set<uint64>::iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr) + for (std::set<uint64>::const_iterator itr = HorsemanAdds.begin(); itr != HorsemanAdds.end(); ++itr) { Creature* add = instance->GetCreature(*itr); if (add && add->isAlive()) diff --git a/src/scripts/eastern_kingdoms/stormwind_city.cpp b/src/scripts/eastern_kingdoms/stormwind_city.cpp index 6a9136fa73f..80f73d2b9ba 100644 --- a/src/scripts/eastern_kingdoms/stormwind_city.cpp +++ b/src/scripts/eastern_kingdoms/stormwind_city.cpp @@ -266,35 +266,40 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI { npc_lord_gregor_lescovarAI(Creature* pCreature) : npc_escortAI(pCreature) { - pMarzon = NULL; - pTyrion = NULL; pCreature->RestoreFaction(); } uint32 uiTimer; uint32 uiPhase; - Creature* pMarzon; - Creature* pTyrion; + uint64 MarzonGUID; void Reset() { uiTimer = 0; uiPhase = 0; + + MarzonGUID = 0; } void EnterEvadeMode() { m_creature->DisappearAndDie(); - if (pMarzon && pMarzon->isAlive()) - pMarzon->DisappearAndDie(); + if (Creature *pMarzon = Unit::GetCreature(*m_creature, MarzonGUID)) + { + if (pMarzon->isAlive()) + pMarzon->DisappearAndDie(); + } } void EnterCombat(Unit* pWho) { - if (pMarzon && pMarzon->isAlive() && !pMarzon->isInCombat()) - pMarzon->AI()->AttackStart(pWho); + if (Creature *pMarzon = Unit::GetCreature(*m_creature, MarzonGUID)) + { + if (pMarzon->isAlive() && !pMarzon->isInCombat()) + pMarzon->AI()->AttackStart(pWho); + } } void WaypointReached(uint32 uiPointId) @@ -309,8 +314,11 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI break; case 16: SetEscortPaused(true); - if (pMarzon = m_creature->SummonCreature(NPC_MARZON_BLADE,-8411.360352, 480.069733, 123.760895, 4.941504, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + if (Creature *pMarzon = m_creature->SummonCreature(NPC_MARZON_BLADE,-8411.360352, 480.069733, 123.760895, 4.941504, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1000)) + { pMarzon->GetMotionMaster()->MovePoint(0,-8408.000977, 468.611450, 123.759903); + MarzonGUID = pMarzon->GetGUID(); + } uiTimer = 2000; uiPhase = 4; break; @@ -323,7 +331,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI m_creature->GetCreatureListWithEntryInGrid(GuardList,NPC_STORMWIND_ROYAL,8.0f); if (!GuardList.empty()) { - for (std::list<Creature*>::iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) { if (Creature* pGuard = *itr) pGuard->DisappearAndDie(); @@ -361,7 +369,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI uiPhase = 0; break; case 5: - if (pMarzon) + if (Creature *pMarzon = Unit::GetCreature(*m_creature, MarzonGUID)) DoScriptText(SAY_MARZON_1, pMarzon); uiTimer = 3000; uiPhase = 6; @@ -376,7 +384,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI case 7: if (Creature* pTyrion = m_creature->FindNearestCreature(NPC_TYRION, 20.0f, true)) DoScriptText(SAY_TYRION_2, pTyrion); - if (pMarzon) + if (Creature *pMarzon = Unit::GetCreature(*m_creature, MarzonGUID)) pMarzon->setFaction(14); m_creature->setFaction(14); uiTimer = 0; @@ -498,13 +506,9 @@ struct npc_tyrion_spybotAI : public npc_escortAI uint32 uiTimer; uint32 uiPhase; - Creature* pTyrion; - Creature* pLescovar; void Reset() { - pLescovar = NULL; - pTyrion = NULL; uiTimer = 0; uiPhase = 0; } @@ -547,8 +551,11 @@ struct npc_tyrion_spybotAI : public npc_escortAI uiPhase = 2; break; case 2: + /* + FIXME: Why have this if pTyrion not declared? if (pTyrion) DoScriptText(SAY_TYRION_1, pTyrion); + */ uiTimer = 3000; uiPhase = 3; break; @@ -579,8 +586,11 @@ struct npc_tyrion_spybotAI : public npc_escortAI uiPhase = 0; break; case 8: + /* + FIXME: Why have this if pLescovar not declared? if (pLescovar) DoScriptText(SAY_LESCOVAR_1, pLescovar); + */ uiTimer = 3000; uiPhase = 9; break; @@ -590,12 +600,15 @@ struct npc_tyrion_spybotAI : public npc_escortAI uiPhase = 10; break; case 10: + /* + FIXME: Why have this if pLescovar not declared? if (pLescovar && pLescovar->isAlive()) { if (Player* pPlayer = GetPlayerForEscort()) CAST_AI(npc_lord_gregor_lescovarAI,pLescovar->AI())->Start(false, false, pPlayer->GetGUID()); CAST_AI(npc_lord_gregor_lescovarAI, pLescovar->AI())->SetMaxPlayerDistance(200.0f); } + */ m_creature->DisappearAndDie(); uiTimer = 0; uiPhase = 0; diff --git a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp index 3545ba602e6..f4d0e3d29e7 100644 --- a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp +++ b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp @@ -251,7 +251,7 @@ struct instance_stratholme : public ScriptedInstance HandleGameObject(portGauntletGUID, false); uint32 count = abomnationGUID.size(); - for (std::set<uint64>::iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i) + for (std::set<uint64>::const_iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i) { if (Creature* pAbom = instance->GetCreature(*i)) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp index b434ef5c3b4..2359b75f5b7 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp @@ -313,7 +313,7 @@ struct boss_brutallusAI : public ScriptedAI { std::list<Unit*> pTargets; SelectTargetList(pTargets, 10, SELECT_TARGET_RANDOM, 100, true); - for (std::list<Unit*>::iterator i = pTargets.begin(); i != pTargets.end(); ++i) + for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) if(!(*i)->HasAura(SPELL_BURN)) { (*i)->CastSpell((*i), SPELL_BURN, true); diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp index 48a51020e73..26bdb7984c0 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp @@ -533,7 +533,7 @@ struct boss_felmystAI : public ScriptedAI cell.Visit(pair, cSearcher, *(m_creature->GetMap())); } - for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i) + for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { if (entry == MOB_VAPOR_TRAIL && Phase == PHASE_FLIGHT) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp index 6aaa00fd6ac..8b873e7fdd3 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp @@ -302,7 +302,7 @@ struct boss_kalecgosAI : public ScriptedAI { std::list<HostileReference*> &m_threatlist = me->getThreatManager().getThreatList(); std::list<Unit*> targetList; - for (std::list<HostileReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr) if((*itr)->getTarget() && (*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && (*itr)->getTarget()->GetGUID() != me->getVictim()->GetGUID() && !(*itr)->getTarget()->HasAura(AURA_SPECTRAL_EXHAUSTION) && (*itr)->getTarget()->GetPositionZ() > me->GetPositionZ()-5) targetList.push_back((*itr)->getTarget()); if(targetList.empty()) @@ -310,7 +310,7 @@ struct boss_kalecgosAI : public ScriptedAI SpectralBlastTimer = 1000; return; } - std::list<Unit*>::iterator i = targetList.begin(); + std::list<Unit*>::const_iterator i = targetList.begin(); advance(i, rand()%targetList.size()); if((*i)) { @@ -614,7 +614,7 @@ struct boss_sathrovarrAI : public ScriptedAI if (ResetThreat <= diff) { - for (std::list<HostileReference*>::iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = me->getThreatManager().getThreatList().begin(); itr != me->getThreatManager().getThreatList().end(); ++itr) { if(Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid())) { diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp index 1b8d51be960..b6711917f56 100644 --- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp @@ -946,7 +946,7 @@ struct mob_hand_of_the_deceiverAI : public ScriptedAI Creature* Portal = DoSpawnCreature(CREATURE_FELFIRE_PORTAL, 0, 0,0, 0, TEMPSUMMON_TIMED_DESPAWN, 20000); if (Portal) { - std::list<HostileReference*>::iterator itr; + std::list<HostileReference*>::const_iterator itr; for (itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr) { Unit* pUnit = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); diff --git a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp index 3e3fcc18adf..6357c156152 100644 --- a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -96,7 +96,7 @@ struct instance_uldaman : public ScriptedInstance void ActivateStoneKeepers() { - for (std::vector<uint64>::iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i) + for (std::vector<uint64>::const_iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (!pTarget || !pTarget->isAlive() || pTarget->getFaction()==14) @@ -116,7 +116,7 @@ struct instance_uldaman : public ScriptedInstance if (!archaedas) return; - for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) + for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (!pTarget || !pTarget->isAlive() || pTarget->getFaction()==14) @@ -131,7 +131,7 @@ struct instance_uldaman : public ScriptedInstance void DeActivateMinions() { // first despawn any aggroed wall minions - for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) + for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14) @@ -141,7 +141,7 @@ struct instance_uldaman : public ScriptedInstance } // Vault Walkers - for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i) + for (std::vector<uint64>::const_iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14) @@ -151,7 +151,7 @@ struct instance_uldaman : public ScriptedInstance } // Earthen Guardians - for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i) + for (std::vector<uint64>::const_iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14) @@ -177,7 +177,7 @@ struct instance_uldaman : public ScriptedInstance void RespawnMinions() { // first respawn any aggroed wall minions - for (std::vector<uint64>::iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) + for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (pTarget && pTarget->isDead()) @@ -189,7 +189,7 @@ struct instance_uldaman : public ScriptedInstance } // Vault Walkers - for (std::vector<uint64>::iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i) + for (std::vector<uint64>::const_iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (pTarget && pTarget->isDead()) @@ -201,7 +201,7 @@ struct instance_uldaman : public ScriptedInstance } // Earthen Guardians - for (std::vector<uint64>::iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i) + for (std::vector<uint64>::const_iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); if (pTarget && pTarget->isDead()) diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp index 7090fc8ddb5..394e61e7785 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp @@ -197,7 +197,7 @@ struct boss_akilzonAI : public ScriptedAI cell.Visit(p, grid_unit_searcher, *(m_creature->GetMap())); } //dealdamege - for (std::list<Unit*>::iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i) + for (std::list<Unit*>::const_iterator i = tempUnitMap.begin(); i != tempUnitMap.end(); ++i) { if (!Cloud->IsWithinDist(*i, 6, false)) { diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp index 94eb393f7cc..7233ae76fad 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp @@ -306,7 +306,7 @@ struct boss_hex_lord_malacrassAI : public ScriptedAI AddList.erase(AddList.begin()+rand()%AddList.size()); uint8 i = 0; - for (std::vector<uint32>::iterator itr = AddList.begin(); itr != AddList.end(); ++itr, ++i) + for (std::vector<uint32>::const_iterator itr = AddList.begin(); itr != AddList.end(); ++itr, ++i) AddEntry[i] = *itr; } diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp index 8546deb5237..d833a884e02 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp @@ -246,7 +246,7 @@ struct boss_janalaiAI : public ScriptedAI if (!templist.size()) return false; - for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i) + for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { if (uiAction == 1) (*i)->SetDisplayId(10056); @@ -275,7 +275,7 @@ struct boss_janalaiAI : public ScriptedAI cell.Visit(pair, cSearcher, *(m_creature->GetMap())); } - for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i) + for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { (*i)->CastSpell(*i, SPELL_FIRE_BOMB_DAMAGE, true); (*i)->RemoveAllAuras(); @@ -510,7 +510,7 @@ struct mob_amanishi_hatcherAI : public ScriptedAI //error_log("Eggs %d at %d", templist.size(), side); - for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end() && num > 0; ++i) + for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end() && num > 0; ++i) if ((*i)->GetDisplayId() != 11686) { (*i)->CastSpell(*i, SPELL_HATCH_EGG, false); diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp index 4662ee6253e..3c3cecc9fce 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp @@ -167,7 +167,7 @@ struct boss_nalorakkAI : public ScriptedAI if (!templist.size()) return; - for (std::list<Creature*>::iterator i = templist.begin(); i != templist.end(); ++i) + for (std::list<Creature*>::const_iterator i = templist.begin(); i != templist.end(); ++i) { if ((*i) && m_creature->IsWithinDistInMap((*i),25)) { diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp index 7dcea97b86b..56ebe4a5c4b 100644 --- a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp +++ b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp @@ -218,7 +218,7 @@ struct boss_mandokirAI : public ScriptedAI { TargetInRange = 0; - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); for (; i != m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit(*m_creature, (*i)->getUnitGuid()); diff --git a/src/scripts/kalimdor/azuremyst_isle.cpp b/src/scripts/kalimdor/azuremyst_isle.cpp index bcbdfaa8760..280d78fc315 100644 --- a/src/scripts/kalimdor/azuremyst_isle.cpp +++ b/src/scripts/kalimdor/azuremyst_isle.cpp @@ -488,7 +488,7 @@ struct npc_geezleAI : public ScriptedAI Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(m_creature, players, checker); m_creature->VisitNearbyWorldObject(radius, searcher); - for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr) + for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if((*itr)->GetQuestStatus(QUEST_TREES_COMPANY)==QUEST_STATUS_INCOMPLETE &&(*itr)->HasAura(SPELL_TREE_DISGUISE) ) @@ -505,7 +505,7 @@ struct npc_geezleAI : public ScriptedAI if (!FlagList.empty()) { - for (std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr) + for (std::list<GameObject*>::const_iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr) { if (despawn) { diff --git a/src/scripts/kalimdor/boss_azuregos.cpp b/src/scripts/kalimdor/boss_azuregos.cpp index 26801be6c8e..f152dbe1378 100644 --- a/src/scripts/kalimdor/boss_azuregos.cpp +++ b/src/scripts/kalimdor/boss_azuregos.cpp @@ -72,7 +72,7 @@ struct boss_azuregosAI : public ScriptedAI { DoScriptText(SAY_TELEPORT, m_creature); std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostileReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp index 1377439c40b..91ff54153ea 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp @@ -307,7 +307,7 @@ struct boss_archimondeAI : public hyjal_trashAI return false; std::list<Unit*> targets; - std::list<HostileReference*>::iterator itr = m_threatlist.begin(); + std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp index 1885fadc3c1..743ef4c56c1 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -153,7 +153,7 @@ struct boss_kazrogalAI : public hyjal_trashAI m_creature->CastCustomSpell(m_creature, SPELL_MARK, NULL, NULL, NULL, false, NULL, NULL, m_creature->GetGUID()); std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp index c6d77c0f966..92e65bfa0b4 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.cpp @@ -950,7 +950,7 @@ void hyjalAI::HideNearPos(float x, float y) if (!creatures.empty()) { - for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) { (*itr)->SetVisibility(VISIBILITY_OFF); (*itr)->setFaction(35);//make them friendly so mobs won't attack them @@ -1007,7 +1007,7 @@ void hyjalAI::WaypointReached(uint32 i) if (!creatures.empty()) { - for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) { if ((*itr) && (*itr)->isAlive() && (*itr) != m_creature && (*itr)->GetEntry() != JAINA) { @@ -1048,7 +1048,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) if (!creatures.empty()) { - for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = creatures.begin(); itr != creatures.end(); ++itr) { if ((*itr) && (*itr)->isAlive()) { diff --git a/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp index 163a530bede..d45e4e86166 100644 --- a/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp @@ -220,7 +220,7 @@ struct instance_mount_hyjal : public ScriptedInstance { if (!m_uiAncientGemGUID.empty()) { - for (std::list<uint64>::iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr) + for (std::list<uint64>::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr) { //don't know how long it expected DoRespawnGameObject(*itr,DAY); diff --git a/src/scripts/kalimdor/silithus.cpp b/src/scripts/kalimdor/silithus.cpp index 2637543637d..1e90368183a 100644 --- a/src/scripts/kalimdor/silithus.cpp +++ b/src/scripts/kalimdor/silithus.cpp @@ -784,7 +784,7 @@ struct mob_qiraj_war_spawnAI : public ScriptedAI uint32 SpellTimer1, SpellTimer2, SpellTimer3,SpellTimer4; bool Timers; bool hasTarget; - Unit* trigger; + void Reset() { MobGUID = 0; @@ -861,7 +861,7 @@ struct mob_qiraj_war_spawnAI : public ScriptedAI if(pTarget) m_creature->AI()->AttackStart(pTarget); } - if (!(trigger = m_creature->FindNearestCreature(15379,100))) + if (!(m_creature->FindNearestCreature(15379,100))) DoCast(m_creature, 33652); if (!UpdateVictim()) @@ -966,7 +966,7 @@ struct npc_anachronos_quest_triggerAI : public ScriptedAI const Group::MemberSlotList members = EventGroup->GetMemberSlots(); - for (Group::member_citerator itr = members.begin(); itr!= members.end(); itr++) + for (Group::member_citerator itr = members.begin(); itr!= members.end(); ++itr) { GroupMember = (Unit::GetPlayer(itr->guid)); if(!GroupMember) @@ -1039,7 +1039,7 @@ bool GOQuestAccept_GO_crystalline_tear(Player* plr, GameObject* go, Quest const* Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535,1535.14,2.61,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,150000); Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767, 1533.148,2.61, 1.5,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,150000); Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52, 1537.843, 2.61, 5.7,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,150000); - Unit *Fandral = Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462, 1535.843, 2.61, 3.141592,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,215000); + /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462, 1535.843, 2.61, 3.141592,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,215000); Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75, 1538.795, 2.61, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); if(Merithra) diff --git a/src/scripts/kalimdor/tanaris.cpp b/src/scripts/kalimdor/tanaris.cpp index b343b00139f..73ac865d91e 100644 --- a/src/scripts/kalimdor/tanaris.cpp +++ b/src/scripts/kalimdor/tanaris.cpp @@ -461,7 +461,7 @@ struct npc_toogaAI : public FollowerAI uint32 m_uiPostEventTimer; uint32 m_uiPhasePostEvent; - Unit* pTorta; + uint64 TortaGUID; void Reset() { @@ -469,7 +469,7 @@ struct npc_toogaAI : public FollowerAI m_uiPostEventTimer = 1000; m_uiPhasePostEvent = 0; - pTorta = NULL; + TortaGUID = 0; } void MoveInLineOfSight(Unit *pWho) @@ -486,7 +486,7 @@ struct npc_toogaAI : public FollowerAI pPlayer->GroupEventHappens(QUEST_TOOGA, m_creature); } - pTorta = pWho; + TortaGUID = pWho->GetGUID(); SetFollowComplete(true); } } @@ -514,6 +514,7 @@ struct npc_toogaAI : public FollowerAI { m_uiPostEventTimer = 5000; + Unit *pTorta = Unit::GetUnit(*m_creature, TortaGUID); if (!pTorta || !pTorta->isAlive()) { //something happened, so just complete diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp index bea64893b2c..e4c729d8ada 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp @@ -541,10 +541,10 @@ struct cthunAI : public Scripted_NoMovementAI if (Stomach_Map.empty()) return NULL; - UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin(); + UNORDERED_MAP<uint64, bool>::const_iterator i = Stomach_Map.begin(); std::list<Unit*> temp; - std::list<Unit*>::iterator j; + std::list<Unit*>::const_iterator j; //Get all players in map while (i != Stomach_Map.end()) @@ -654,7 +654,7 @@ struct cthunAI : public Scripted_NoMovementAI //Place all units in threat list on outside of stomach Stomach_Map.clear(); - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); for (; i != m_creature->getThreatManager().getThreatList().end(); ++i) { //Outside stomach diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp index 4949cd5369d..4f78c361fa2 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -320,7 +320,7 @@ struct boss_twinemperorsAI : public ScriptedAI Creature *nearb = NULL; - for (std::list<Creature*>::iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter) + for (std::list<Creature*>::const_iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter) { Creature *c = *iter; if (c) diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 24e9c68d435..80b9b2a36d6 100644 --- a/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -145,7 +145,7 @@ struct aqsentinelAI : public ScriptedAI if (assistList.empty()) return; - for (std::list<Creature*>::iterator iter = assistList.begin(); iter != assistList.end(); ++iter) + for (std::list<Creature*>::const_iterator iter = assistList.begin(); iter != assistList.end(); ++iter) AddBuddyToList((*iter)->GetGUID()); } @@ -249,7 +249,7 @@ struct aqsentinelAI : public ScriptedAI Unit *GetHatedManaUser() const { - std::list<HostileReference*>::iterator i; + std::list<HostileReference*>::const_iterator i; for (i = m_creature->getThreatManager().getThreatList().begin(); i != m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/kalimdor/ungoro_crater.cpp b/src/scripts/kalimdor/ungoro_crater.cpp index b288538acba..3a9944fb041 100644 --- a/src/scripts/kalimdor/ungoro_crater.cpp +++ b/src/scripts/kalimdor/ungoro_crater.cpp @@ -175,14 +175,14 @@ struct npc_ringoAI : public FollowerAI uint32 m_uiEndEventProgress; uint32 m_uiEndEventTimer; - Unit* pSpraggle; + uint64 SpraggleGUID; void Reset() { m_uiFaintTimer = urand(30000, 60000); m_uiEndEventProgress = 0; m_uiEndEventTimer = 1000; - pSpraggle = NULL; + SpraggleGUID = 0; } void MoveInLineOfSight(Unit *pWho) @@ -199,7 +199,7 @@ struct npc_ringoAI : public FollowerAI pPlayer->GroupEventHappens(QUEST_A_LITTLE_HELP, m_creature); } - pSpraggle = pWho; + SpraggleGUID = pWho->GetGUID(); SetFollowComplete(true); } } @@ -244,6 +244,7 @@ struct npc_ringoAI : public FollowerAI { if (m_uiEndEventTimer <= uiDiff) { + Unit *pSpraggle = Unit::GetUnit(*m_creature, SpraggleGUID); if (!pSpraggle || !pSpraggle->isAlive()) { SetFollowComplete(); diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp index 923f000a99b..dbadd70cb70 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_herald_volazj.cpp @@ -205,7 +205,7 @@ struct boss_volazjAI : public ScriptedAI Summons.Despawn(summon); // Check if all summons in this phase killed - for(SummonList::const_iterator iter = Summons.begin(); iter!=Summons.end(); iter++) + for(SummonList::const_iterator iter = Summons.begin(); iter!=Summons.end(); ++iter) { if(Creature *visage = Unit::GetCreature(*m_creature, *iter)) { diff --git a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp index e2fe94872ab..64e70435244 100644 --- a/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/scripts/northrend/azjol_nerub/ahnkahet/boss_prince_taldaram.cpp @@ -209,7 +209,7 @@ struct boss_taldaramAI : public ScriptedAI Unit *pTarget = NULL; std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); // exclude pets & totems diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp index 4085605facb..4f19d85ca01 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_black_knight.cpp @@ -131,7 +131,7 @@ struct boss_black_knightAI : public ScriptedAI if (SummonList.empty()) return; - for(std::list<uint64>::iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) if (pTemp) diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp index 01cdbc7b083..edaad389bad 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/instance_trial_of_the_champion.cpp @@ -171,7 +171,7 @@ struct instance_trial_of_the_champion : public ScriptedInstance m_auiEncounter[0] = uiData; if (uiData == IN_PROGRESS) { - for(std::list<uint64>::iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr) if (Creature* pSummon = instance->GetCreature(*itr)) pSummon->RemoveFromWorld(); }else if (uiData == DONE) diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp index e24fea2cd0c..6f783bdf09e 100644 --- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp +++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/trial_of_the_champion.cpp @@ -141,7 +141,7 @@ struct npc_announcer_toc5AI : public ScriptedAI break; } - for(std::list<uint64>::iterator itr = TempList.begin(); itr != TempList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = TempList.begin(); itr != TempList.end(); ++itr) if (Creature* pSummon = Unit::GetCreature(*m_creature, *itr)) AggroAllPlayers(pSummon); }else if (uiLesserChampions == 9) @@ -416,7 +416,7 @@ struct npc_announcer_toc5AI : public ScriptedAI case 3: if (!Champion1List.empty()) { - for(std::list<uint64>::iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) + for(std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) if (Creature* pSummon = Unit::GetCreature(*m_creature, *itr)) AggroAllPlayers(pSummon); NextStep(0,false); diff --git a/src/scripts/northrend/crystalsong_forest.cpp b/src/scripts/northrend/crystalsong_forest.cpp index 00a70003b54..0400f1714ef 100644 --- a/src/scripts/northrend/crystalsong_forest.cpp +++ b/src/scripts/northrend/crystalsong_forest.cpp @@ -48,7 +48,6 @@ struct npc_warmage_violetstandAI : public Scripted_NoMovementAI npc_warmage_violetstandAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature){} uint32 m_uiTimer; //Timer until recast - std::list<Creature *> orbList; void Reset() { @@ -69,10 +68,12 @@ struct npc_warmage_violetstandAI : public Scripted_NoMovementAI switch(me->GetEntry()) { case NPC_WARMAGE_SARINA: + { + std::list<Creature*> orbList; GetCreatureListWithEntryInGrid(orbList, m_creature, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f); if (!orbList.empty()) { - for (std::list<Creature*>::iterator itr = orbList.begin(); itr != orbList.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = orbList.begin(); itr != orbList.end(); ++itr) { if (Creature* pOrb = *itr) if (pOrb->GetPositionY() < 1000) @@ -80,6 +81,7 @@ struct npc_warmage_violetstandAI : public Scripted_NoMovementAI } } m_uiTimer = 90000; + } break; case NPC_WARMAGE_HALISTER: case NPC_WARMAGE_ILSUDRIA: diff --git a/src/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/scripts/northrend/draktharon_keep/boss_novos.cpp index 0113c21ae99..0188228ee61 100644 --- a/src/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -106,7 +106,7 @@ struct boss_novosAI : public Scripted_NoMovementAI luiCrystals.push_back(pInstance->GetData64(DATA_NOVOS_CRYSTAL_2)); luiCrystals.push_back(pInstance->GetData64(DATA_NOVOS_CRYSTAL_3)); luiCrystals.push_back(pInstance->GetData64(DATA_NOVOS_CRYSTAL_4)); - for (std::list<uint64>::iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) + for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) { if (GameObject* pTemp = pInstance->instance->GetGameObject(*itr)) pTemp->SetGoState(GO_STATE_READY); @@ -123,7 +123,7 @@ struct boss_novosAI : public Scripted_NoMovementAI DoCast(SPELL_ARCANE_FIELD); if (pInstance) { - for (std::list<uint64>::iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) + for (std::list<uint64>::const_iterator itr = luiCrystals.begin(); itr != luiCrystals.end(); ++itr) { if (GameObject *pTemp = pInstance->instance->GetGameObject(*itr)) pTemp->SetGoState(GO_STATE_ACTIVE); diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index e117161dc0b..1e6521b1b03 100644 --- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -147,7 +147,7 @@ struct boss_tharon_jaAI : public ScriptedAI DoScriptText(RAND(SAY_FLESH_1,SAY_FLESH_2),m_creature); m_creature->SetDisplayId(MODEL_FLESH); std::list<HostileReference*>& threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER) @@ -203,7 +203,7 @@ struct boss_tharon_jaAI : public ScriptedAI uiRainOfFireTimer = urand(14*IN_MILISECONDS,18*IN_MILISECONDS); uiShadowVolleyTimer = urand(8*IN_MILISECONDS,10*IN_MILISECONDS); std::list<HostileReference*>& threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { Unit *pTemp = Unit::GetUnit((*m_creature),(*itr)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER) diff --git a/src/scripts/northrend/grizzly_hills.cpp b/src/scripts/northrend/grizzly_hills.cpp index a6c575d2e54..980c54df617 100644 --- a/src/scripts/northrend/grizzly_hills.cpp +++ b/src/scripts/northrend/grizzly_hills.cpp @@ -150,17 +150,14 @@ enum eFloppy struct npc_emilyAI : public npc_escortAI { npc_emilyAI(Creature* pCreature) : npc_escortAI(pCreature) { } - + uint32 m_uiChatTimer; - + uint64 RWORGGUID; uint64 MrfloppyGUID; - - Creature* Mrfloppy; - Creature* RWORG; + bool Completed; - - + void JustSummoned(Creature* pSummoned) { if (Creature* Mrfloppy = GetClosestCreatureWithEntry(m_creature, NPC_MRFLOPPY, 50.0f)) @@ -168,7 +165,7 @@ struct npc_emilyAI : public npc_escortAI else pSummoned->AI()->AttackStart(m_creature->getVictim()); } - + void WaypointReached(uint32 i) { Player* pPlayer = GetPlayerForEscort(); @@ -177,57 +174,77 @@ struct npc_emilyAI : public npc_escortAI switch (i) { case 9: - Mrfloppy = GetClosestCreatureWithEntry(m_creature, NPC_MRFLOPPY, 100.0f); + if (Creature *Mrfloppy = GetClosestCreatureWithEntry(m_creature, NPC_MRFLOPPY, 100.0f)) + MrfloppyGUID = Mrfloppy->GetGUID(); break; case 10: - if (Mrfloppy) + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) { DoScriptText(SAY_WORGHAGGRO1, m_creature); m_creature->SummonCreature(NPC_HUNGRY_WORG,m_creature->GetPositionX()+5,m_creature->GetPositionY()+2,m_creature->GetPositionZ()+1,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); } break; case 11: - Mrfloppy->GetMotionMaster()->MoveFollow(m_creature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) + Mrfloppy->GetMotionMaster()->MoveFollow(m_creature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); break; case 17: - Mrfloppy->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ()); + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) + Mrfloppy->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ()); DoScriptText(SAY_WORGRAGGRO3, m_creature); - RWORG = m_creature->SummonCreature(NPC_RAVENOUS_WORG,m_creature->GetPositionX()+10,m_creature->GetPositionY()+8,m_creature->GetPositionZ()+2,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); - RWORG->setFaction(35); + if (Creature *RWORG = m_creature->SummonCreature(NPC_RAVENOUS_WORG,m_creature->GetPositionX()+10,m_creature->GetPositionY()+8,m_creature->GetPositionZ()+2,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000)) + { + RWORG->setFaction(35); + RWORGGUID = RWORG->GetGUID(); + } break; case 18: - if (Mrfloppy) + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) { - RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); + if (Creature *RWORG = Unit::GetCreature(*m_creature, RWORGGUID)) + RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); DoCast(Mrfloppy,SPELL_MRFLOPPY); } break; case 19: - if (Mrfloppy->HasAura(SPELL_MRFLOPPY, 0)) - Mrfloppy->EnterVehicle(RWORG); + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) + { + if (Mrfloppy->HasAura(SPELL_MRFLOPPY, 0)) + { + if (Creature *RWORG = Unit::GetCreature(*m_creature, RWORGGUID)) + Mrfloppy->EnterVehicle(RWORG); + } + } break; case 20: - if (Mrfloppy) + if (Creature *RWORG = Unit::GetCreature(*m_creature, RWORGGUID)) RWORG->HandleEmoteCommand(34); break; case 21: - if (Mrfloppy) + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) { - RWORG->Kill(Mrfloppy); - Mrfloppy->ExitVehicle(); - RWORG->setFaction(14); - RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10,RWORG->GetPositionY()+80,RWORG->GetPositionZ()); - DoScriptText(SAY_VICTORY2, m_creature); + if (Creature *RWORG = Unit::GetCreature(*m_creature, RWORGGUID)) + { + RWORG->Kill(Mrfloppy); + Mrfloppy->ExitVehicle(); + RWORG->setFaction(14); + RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10,RWORG->GetPositionY()+80,RWORG->GetPositionZ()); + DoScriptText(SAY_VICTORY2, m_creature); + } } break; case 22: - if (Mrfloppy && Mrfloppy->isDead()) + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) { - RWORG->DisappearAndDie(); - m_creature->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); - Mrfloppy->setDeathState(ALIVE); - Mrfloppy->GetMotionMaster()->MoveFollow(m_creature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); - DoScriptText(SAY_VICTORY3, m_creature); + if (Mrfloppy->isDead()) + { + if (Creature *RWORG = Unit::GetCreature(*m_creature, RWORGGUID)) + RWORG->DisappearAndDie(); + m_creature->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); + Mrfloppy->setDeathState(ALIVE); + Mrfloppy->GetMotionMaster()->MoveFollow(m_creature, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); + DoScriptText(SAY_VICTORY3, m_creature); + } } break; case 24: @@ -244,28 +261,28 @@ struct npc_emilyAI : public npc_escortAI break; case 27: m_creature->DisappearAndDie(); - if (Mrfloppy) + if (Creature *Mrfloppy = Unit::GetCreature(*m_creature, MrfloppyGUID)) Mrfloppy->DisappearAndDie(); break; } } - + void EnterCombat(Unit* Who) { DoScriptText(SAY_RANDOMAGGRO, m_creature); } - + void Reset() { m_uiChatTimer = 4000; - Mrfloppy = NULL; - RWORG = NULL; + MrfloppyGUID = 0; + RWORGGUID = 0; } - + void UpdateAI(const uint32 uiDiff) { npc_escortAI::UpdateAI(uiDiff); - + if (HasEscortState(STATE_ESCORT_ESCORTING)) { if (m_uiChatTimer <= uiDiff) @@ -278,7 +295,6 @@ struct npc_emilyAI : public npc_escortAI } }; - bool QuestAccept_npc_emily(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_PERILOUS_ADVENTURE) @@ -305,23 +321,13 @@ CreatureAI* GetAI_npc_emily(Creature* pCreature) struct npc_mrfloppyAI : public ScriptedAI { npc_mrfloppyAI(Creature *c) : ScriptedAI(c) {} - + uint64 EmilyGUID; uint64 RWORGGUID; uint64 HWORGGUID; - - Creature* HWORG; - Creature* RWORG; - - Creature* Emily; - - void Reset() - { - HWORG = NULL; - RWORG = NULL; - Emily = NULL; - } - + + void Reset() {} + void EnterCombat(Unit* Who) { if (Creature* Emily = GetClosestCreatureWithEntry(m_creature, NPC_EMILY, 50.0f)) @@ -339,11 +345,11 @@ struct npc_mrfloppyAI : public ScriptedAI } } } - + void EnterEvadeMode() {} - + void MoveInLineOfSight(Unit *who) {} - + void UpdateAI(const uint32 diff) { if (!UpdateVictim()) diff --git a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp index 7aad876e56c..c6354a8e0ba 100644 --- a/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp +++ b/src/scripts/northrend/naxxramas/boss_kelthuzad.cpp @@ -281,7 +281,7 @@ struct boss_kelthuzadAI : public BossAI me->setFaction(35); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); - std::map<uint64, float>::iterator itr; + std::map<uint64, float>::const_iterator itr; for (itr = chained.begin(); itr != chained.end(); ++itr) { if (Player* charmed = Unit::GetPlayer((*itr).first)) @@ -326,7 +326,7 @@ struct boss_kelthuzadAI : public BossAI _JustDied(); DoScriptText(SAY_DEATH, m_creature); - std::map<uint64, float>::iterator itr; + std::map<uint64, float>::const_iterator itr; for (itr = chained.begin(); itr != chained.end(); ++itr) { if (Player* pPlayer = Unit::GetPlayer((*itr).first)) @@ -573,7 +573,7 @@ struct boss_kelthuzadAI : public BossAI } } } - itr++; + ++itr; } if (chained.empty()) @@ -597,7 +597,7 @@ struct boss_kelthuzadAI : public BossAI if (!unitList.empty()) { - std::vector<Unit*>::iterator itr = unitList.begin(); + std::vector<Unit*>::const_iterator itr = unitList.begin(); advance(itr, rand()%unitList.size()); DoCast(*itr, SPELL_MANA_DETONATION); DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2,SAY_SPECIAL_3), me); diff --git a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp index 438e0f91ec8..86b05e30505 100644 --- a/src/scripts/northrend/naxxramas/boss_patchwerk.cpp +++ b/src/scripts/northrend/naxxramas/boss_patchwerk.cpp @@ -111,7 +111,7 @@ struct boss_patchwerkAI : public BossAI //amount of HP within melee distance uint32 MostHP = 0; Unit* pMostHPTarget = NULL; - std::list<HostileReference*>::iterator i = me->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { Unit *pTarget = (*i)->getTarget(); diff --git a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp index 9a613a7583e..00a9762c431 100644 --- a/src/scripts/northrend/naxxramas/boss_sapphiron.cpp +++ b/src/scripts/northrend/naxxramas/boss_sapphiron.cpp @@ -202,7 +202,7 @@ struct boss_sapphironAI : public BossAI void ClearIceBlock() { - for (IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) + for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) { if (Player* pPlayer = Unit::GetPlayer(itr->first)) pPlayer->RemoveAura(SPELL_ICEBOLT); @@ -291,7 +291,7 @@ struct boss_sapphironAI : public BossAI case EVENT_ICEBOLT: { std::vector<Unit*> targets; - std::list<HostileReference*>::iterator i = me->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER && !(*i)->getTarget()->HasAura(SPELL_ICEBOLT)) targets.push_back((*i)->getTarget()); @@ -300,7 +300,7 @@ struct boss_sapphironAI : public BossAI iceboltCount = 0; else { - std::vector<Unit*>::iterator itr = targets.begin(); + std::vector<Unit*>::const_iterator itr = targets.begin(); advance(itr, rand()%targets.size()); iceblocks.insert(std::make_pair((*itr)->GetGUID(), 0)); DoCast(*itr, SPELL_ICEBOLT); @@ -348,7 +348,7 @@ struct boss_sapphironAI : public BossAI { DoZoneInCombat(); // make sure everyone is in threatlist std::vector<Unit*> targets; - std::list<HostileReference*>::iterator i = me->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { Unit *pTarget = (*i)->getTarget(); @@ -362,7 +362,7 @@ struct boss_sapphironAI : public BossAI continue; } - for (IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) + for (IceBlockMap::const_iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) { if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) { @@ -379,7 +379,7 @@ struct boss_sapphironAI : public BossAI me->CastSpell(me, SPELL_FROST_EXPLOSION, true); - for (std::vector<Unit*>::iterator itr = targets.begin(); itr != targets.end(); ++itr) + for (std::vector<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) (*itr)->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, false); } }; diff --git a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp index bb020c911b2..541466fc238 100644 --- a/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_keristrasza.cpp @@ -161,7 +161,7 @@ struct boss_keristraszaAI : public ScriptedAI if (uiCheckIntenseColdTimer < diff && !bMoreThanTwoIntenseCold) { std::list<HostileReference*> ThreatList = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); itr++) + for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (!pTarget || pTarget->GetTypeId() != TYPEID_PLAYER) diff --git a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp index 3db2021ebf2..20d38148ee9 100644 --- a/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp +++ b/src/scripts/northrend/nexus/nexus/boss_ormorok.cpp @@ -179,7 +179,7 @@ struct boss_ormorokAI : public ScriptedAI case 3: Healer = CLASS_DRUID; break; case 4: Healer = CLASS_SHAMAN; break; } - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); for (; i != m_creature->getThreatManager().getThreatList().end(); ++i) { Unit* pTemp = Unit::GetUnit((*m_creature),(*i)->getUnitGuid()); diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 0c025eaaa0e..c3d3656d9be 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -152,7 +152,7 @@ struct boss_ionarAI : public ScriptedAI if (m_lSparkGUIDList.empty()) return; - for (std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr) { if (Creature* pTemp = m_creature->GetMap()->GetCreature(*itr)) { @@ -173,7 +173,7 @@ struct boss_ionarAI : public ScriptedAI Position pos; m_creature->GetPosition(&pos); - for (std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr) { if (Creature* pSpark = Unit::GetCreature(*m_creature, *itr)) { diff --git a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp index 0401d566c89..7ca5ca16e71 100644 --- a/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/scripts/northrend/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -169,7 +169,7 @@ struct boss_volkhanAI : public ScriptedAI if (m_lGolemGUIDList.empty()) return; - for (std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) { @@ -186,7 +186,7 @@ struct boss_volkhanAI : public ScriptedAI if (m_lGolemGUIDList.empty()) return; - for (std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) { diff --git a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp index 9a8b711363a..f62f8f9b499 100644 --- a/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp +++ b/src/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp @@ -162,7 +162,7 @@ struct mob_tribuna_controllerAI : public ScriptedAI if (!lKaddrakGUIDList.empty()) { uint32 uiPositionCounter = 0; - for (std::list<Creature*>::iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = lKaddrakGUIDList.begin(); itr != lKaddrakGUIDList.end(); ++itr) { if ((*itr)->isAlive()) { @@ -277,7 +277,7 @@ struct npc_brann_hosAI : public npc_escortAI { if (lDwarfGUIDList.empty()) return; - for (std::list<uint64>::iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = lDwarfGUIDList.begin(); itr != lDwarfGUIDList.end(); ++itr) { Creature* pTemp = Unit::GetCreature(*m_creature, pInstance ? (*itr) : 0); if (pTemp && pTemp->isAlive()) diff --git a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp index 5ba5d011d1e..842c4599f69 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_algalon.cpp @@ -166,7 +166,7 @@ struct boss_algalonAI : public ScriptedAI if (m_lCollapsingStarGUIDList.empty()) return; - for(std::list<uint64>::iterator itr = m_lCollapsingStarGUIDList.begin(); itr != m_lCollapsingStarGUIDList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = m_lCollapsingStarGUIDList.begin(); itr != m_lCollapsingStarGUIDList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) { diff --git a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp index 283dee2afdc..34893d2dd41 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_razorscale.cpp @@ -187,7 +187,7 @@ struct boss_razorscaleAI : public BossAI std::list<Unit*> pTargets; SelectTargetList(pTargets, RAID_MODE(3,9), SELECT_TARGET_RANDOM, 100, true); uint8 i = 0; - for (std::list<Unit*>::iterator itr = pTargets.begin(); itr != pTargets.end();) + for (std::list<Unit*>::const_iterator itr = pTargets.begin(); itr != pTargets.end();) { if (m_creature->HasInArc(M_PI, *itr)) { diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp index 0c470d2968e..65eaec5b634 100644 --- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp +++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp @@ -236,7 +236,7 @@ struct boss_ichoronAI : public ScriptedAI bool bIsWaterElementsAlive = false; if (!m_waterElements.empty()) { - for (std::list<uint64>::iterator itr = m_waterElements.begin(); itr != m_waterElements.end(); ++itr) + for (std::list<uint64>::const_iterator itr = m_waterElements.begin(); itr != m_waterElements.end(); ++itr) if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) if (pTemp->isAlive()) { diff --git a/src/scripts/northrend/violet_hold/boss_xevozz.cpp b/src/scripts/northrend/violet_hold/boss_xevozz.cpp index 7b5461ca11c..58bc0644c71 100644 --- a/src/scripts/northrend/violet_hold/boss_xevozz.cpp +++ b/src/scripts/northrend/violet_hold/boss_xevozz.cpp @@ -100,7 +100,7 @@ struct boss_xevozzAI : public ScriptedAI if (assistList.empty()) return; - for(std::list<Creature*>::iterator iter = assistList.begin(); iter != assistList.end(); ++iter) + for(std::list<Creature*>::const_iterator iter = assistList.begin(); iter != assistList.end(); ++iter) { if (Creature* pSphere = *iter) pSphere->Kill(pSphere, false); diff --git a/src/scripts/northrend/violet_hold/violet_hold.cpp b/src/scripts/northrend/violet_hold/violet_hold.cpp index 50bc441f688..16c53b937e9 100644 --- a/src/scripts/northrend/violet_hold/violet_hold.cpp +++ b/src/scripts/northrend/violet_hold/violet_hold.cpp @@ -105,7 +105,7 @@ struct npc_sinclariAI : public ScriptedAI std::list<Creature*> GuardList; m_creature->GetCreatureListWithEntryInGrid(GuardList, NPC_VIOLET_HOLD_GUARD, 40.0f); if (!GuardList.empty()) - for (std::list<Creature*>::iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) { if (Creature* pGuard = *itr) { @@ -122,7 +122,7 @@ struct npc_sinclariAI : public ScriptedAI std::list<Creature*> GuardList; m_creature->GetCreatureListWithEntryInGrid(GuardList, NPC_VIOLET_HOLD_GUARD, 40.0f); if (!GuardList.empty()) - for (std::list<Creature*>::iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = GuardList.begin(); itr != GuardList.end(); ++itr) { if (Creature* pGuard = *itr) { diff --git a/src/scripts/northrend/zuldrak.cpp b/src/scripts/northrend/zuldrak.cpp index 359a7389f3a..0dbedc2d22f 100644 --- a/src/scripts/northrend/zuldrak.cpp +++ b/src/scripts/northrend/zuldrak.cpp @@ -37,11 +37,11 @@ struct npc_drakuru_shacklesAI : public ScriptedAI { npc_drakuru_shacklesAI(Creature* pCreature) : ScriptedAI(pCreature) {} - Unit* Rageclaw; + uint64 RageclawGUID; void Reset() { - Rageclaw = NULL; + RageclawGUID = 0; m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); float x, y, z; @@ -50,13 +50,15 @@ struct npc_drakuru_shacklesAI : public ScriptedAI if (Unit* summon = m_creature->SummonCreature(NPC_RAGECLAW, x, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 1000)) { - Rageclaw = summon; + RageclawGUID = summon->GetGUID(); LockRageclaw(); } } void LockRageclaw() { + Unit *Rageclaw = Unit::GetCreature(*m_creature, RageclawGUID); + // pointer check not needed m_creature->SetInFront(Rageclaw); Rageclaw->SetInFront(m_creature); @@ -69,6 +71,8 @@ struct npc_drakuru_shacklesAI : public ScriptedAI if (!pWho) return; + Creature *Rageclaw = Unit::GetCreature(*m_creature, RageclawGUID); + // pointer check not needed DoCast(Rageclaw, SPELL_FREE_RAGECLAW, true); m_creature->setDeathState(DEAD); @@ -78,7 +82,7 @@ struct npc_drakuru_shacklesAI : public ScriptedAI { if (pSpell->Id == SPELL_UNLOCK_SHACKLE) { - if (Rageclaw) + if (Creature *Rageclaw = Unit::GetCreature(*m_creature, RageclawGUID)) UnlockRageclaw(pCaster); else m_creature->setDeathState(JUST_DIED); @@ -240,10 +244,9 @@ struct npc_gurgthockAI : public ScriptedAI { npc_gurgthockAI(Creature* pCreature) : ScriptedAI(pCreature) { - pSummon = NULL; } - Unit* pSummon; + uint64 SummonGUID; std::list<uint64> SummonList; @@ -257,6 +260,7 @@ struct npc_gurgthockAI : public ScriptedAI void Reset() { + SummonGUID = 0; m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); uiTimer = 0; uiPhase = 0; @@ -275,7 +279,7 @@ struct npc_gurgthockAI : public ScriptedAI m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); - for(std::list<uint64>::iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) + for(std::list<uint64>::const_iterator itr = SummonList.begin(); itr != SummonList.end(); ++itr) { if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) if (pTemp) @@ -344,15 +348,16 @@ struct npc_gurgthockAI : public ScriptedAI switch(uiPhase) { case 1: - pSummon = m_creature->SummonCreature(NPC_ORINOKO_TUSKBREAKER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000); + if (Creature *pSummon = m_creature->SummonCreature(NPC_ORINOKO_TUSKBREAKER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + SummonGUID = pSummon->GetGUID(); uiPhase = 2; uiTimer = 4000; break; case 2: - if (pSummon) + if (Creature *pSummon = Unit::GetCreature(*m_creature, SummonGUID)) pSummon->GetMotionMaster()->MoveJump(5776.319824, -2981.005371, 273.100037, 10.0f, 20.0f); uiPhase = 0; - pSummon = NULL; + SummonGUID = 0; break; case 3: DoScriptText(SAY_QUEST_ACCEPT_KORRAK_2, m_creature); @@ -360,7 +365,8 @@ struct npc_gurgthockAI : public ScriptedAI uiPhase = 4; break; case 4: - pSummon = m_creature->SummonCreature(NPC_KORRAK_BLOODRAGER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000); + if (Creature *pSummon = m_creature->SummonCreature(NPC_KORRAK_BLOODRAGER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + SummonGUID = pSummon->GetGUID(); uiTimer = 3000; uiPhase = 0; break; @@ -454,7 +460,7 @@ struct npc_orinoko_tuskbreakerAI : public ScriptedAI uint32 uiBattleShoutTimer; uint32 uiFishyScentTimer; - Unit* pAffected; + uint64 AffectedGUID; uint64 uiWhisker; void Reset() @@ -465,7 +471,7 @@ struct npc_orinoko_tuskbreakerAI : public ScriptedAI uiBattleShoutTimer = 0; uiFishyScentTimer = 20000; uiWhisker = 0; - pAffected = NULL; + AffectedGUID = 0; } void EnterEvadeMode() @@ -509,8 +515,11 @@ struct npc_orinoko_tuskbreakerAI : public ScriptedAI if (uiFishyScentTimer <= uiDiff) { - if (pAffected = SelectUnit(SELECT_TARGET_RANDOM,0)) + if (Unit *pAffected = SelectUnit(SELECT_TARGET_RANDOM,0)) + { DoCast(pAffected, SPELL_FISHY_SCENT); + AffectedGUID = pAffected->GetGUID(); + } uiFishyScentTimer = 20000; } else uiFishyScentTimer -= uiDiff; @@ -535,8 +544,11 @@ struct npc_orinoko_tuskbreakerAI : public ScriptedAI pSummon->AI()->AttackStart(m_creature->getVictim()); break; case NPC_HUNGRY_PENGUIN: - if (pAffected && pAffected->isAlive()) - pSummon->AI()->AttackStart(pAffected); + if(Unit *pAffected = Unit::GetUnit(*m_creature, AffectedGUID)) + { + if (pAffected->isAlive()) + pSummon->AI()->AttackStart(pAffected); + } break; } } diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp index 9535be2bae1..d7c04a35c9c 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp @@ -122,7 +122,7 @@ struct boss_blackheart_the_inciterAI : public ScriptedAI DoCast(m_creature, SPELL_INCITE_CHAOS); std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) diff --git a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp index a02148d4758..61c4c6dce64 100644 --- a/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp +++ b/src/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp @@ -68,7 +68,7 @@ struct boss_murmurAI : public ScriptedAI void SonicBoomEffect() { std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) @@ -153,7 +153,7 @@ struct boss_murmurAI : public ScriptedAI if (ThunderingStorm_Timer <= diff) { std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) if (Unit *pTarget = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) if (pTarget->isAlive() && !m_creature->IsWithinDist(pTarget, 35, false)) DoCast(pTarget, SPELL_THUNDERING_STORM, true); @@ -176,7 +176,7 @@ struct boss_murmurAI : public ScriptedAI if (!m_creature->IsWithinMeleeRange(m_creature->getVictim())) { std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) + for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i) if (Unit *pTarget = Unit::GetUnit((*m_creature),(*i)->getUnitGuid())) if (pTarget->isAlive() && m_creature->IsWithinMeleeRange(pTarget)) { diff --git a/src/scripts/outland/black_temple/boss_bloodboil.cpp b/src/scripts/outland/black_temple/boss_bloodboil.cpp index 150b631e641..b1fce8d4d42 100644 --- a/src/scripts/outland/black_temple/boss_bloodboil.cpp +++ b/src/scripts/outland/black_temple/boss_bloodboil.cpp @@ -136,7 +136,7 @@ struct boss_gurtogg_bloodboilAI : public ScriptedAI return; std::list<Unit *> targets; - std::list<HostileReference *>::iterator itr = m_threatlist.begin(); + std::list<HostileReference *>::const_iterator itr = m_threatlist.begin(); for (; itr!= m_threatlist.end(); ++itr) //store the threat list in a different container { Unit *pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); @@ -154,7 +154,7 @@ struct boss_gurtogg_bloodboilAI : public ScriptedAI /*SpellEntry const *spellInfo = GetSpellStore()->LookupEntry(SPELL_BLOODBOIL); if (spellInfo) { - for (std::list<Unit *>::iterator itr = targets.begin(); itr != targets.end(); ++itr) + for (std::list<Unit *>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) { Unit *pTarget = *itr; if (!pTarget) return; diff --git a/src/scripts/outland/black_temple/boss_illidan.cpp b/src/scripts/outland/black_temple/boss_illidan.cpp index ed1b1d4df02..54e2139c4ca 100644 --- a/src/scripts/outland/black_temple/boss_illidan.cpp +++ b/src/scripts/outland/black_temple/boss_illidan.cpp @@ -501,7 +501,7 @@ struct boss_illidan_stormrageAI : public ScriptedAI void DeleteFromThreatList(uint64 TargetGUID) { - for (std::list<HostileReference*>::iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = m_creature->getThreatManager().getThreatList().begin(); itr != m_creature->getThreatManager().getThreatList().end(); ++itr) { if ((*itr)->getUnitGuid() == TargetGUID) { @@ -1072,13 +1072,13 @@ struct npc_akama_illidanAI : public ScriptedAI { std::list<HostileReference*>& threatList = m_creature->getThreatManager().getThreatList(); std::vector<Unit*> eliteList; - for (std::list<HostileReference*>::iterator itr = threatList.begin(); itr != threatList.end(); ++itr) + for (std::list<HostileReference*>::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); if (pUnit && pUnit->GetEntry() == ILLIDARI_ELITE) eliteList.push_back(pUnit); } - for (std::vector<Unit*>::iterator itr = eliteList.begin(); itr != eliteList.end(); ++itr) + for (std::vector<Unit*>::const_iterator itr = eliteList.begin(); itr != eliteList.end(); ++itr) (*itr)->setDeathState(JUST_DIED); EnterEvadeMode(); } diff --git a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp index 6504b9918aa..6d23761aa52 100644 --- a/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp +++ b/src/scripts/outland/black_temple/boss_reliquary_of_souls.cpp @@ -189,8 +189,8 @@ struct boss_reliquary_of_soulsAI : public ScriptedAI return; std::list<HostileReference*>& m_threatlist = pTarget->getThreatManager().getThreatList(); - std::list<HostileReference*>::iterator itr = m_threatlist.begin(); - for (; itr != m_threatlist.end(); itr++) + std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); + for (; itr != m_threatlist.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); if (pUnit) @@ -390,7 +390,7 @@ struct boss_essence_of_sufferingAI : public ScriptedAI if (m_threatlist.empty()) return; // No point continuing if empty threatlist. std::list<Unit*> targets; - std::list<HostileReference*>::iterator itr = m_threatlist.begin(); + std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); for (; itr != m_threatlist.end(); ++itr) { Unit* pUnit = Unit::GetUnit((*m_creature), (*itr)->getUnitGuid()); diff --git a/src/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/scripts/outland/black_temple/boss_shade_of_akama.cpp index 23d298ff05c..7c1e5406d69 100644 --- a/src/scripts/outland/black_temple/boss_shade_of_akama.cpp +++ b/src/scripts/outland/black_temple/boss_shade_of_akama.cpp @@ -259,7 +259,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI if (!Channelers.empty()) { - for (std::list<uint64>::iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) + for (std::list<uint64>::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) { Creature* Channeler = (Unit::GetCreature(*m_creature, *itr)); if (Channeler) @@ -347,7 +347,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI if (!ChannelerList.empty()) { - for (std::list<Creature*>::iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr) + for (std::list<Creature*>::const_iterator itr = ChannelerList.begin(); itr != ChannelerList.end(); ++itr) { CAST_AI(mob_ashtongue_channelerAI, (*itr)->AI())->ShadeGUID = m_creature->GetGUID(); Channelers.push_back((*itr)->GetGUID()); @@ -365,7 +365,7 @@ struct boss_shade_of_akamaAI : public ScriptedAI return; } - for (std::list<uint64>::iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) + for (std::list<uint64>::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr) if (Creature* Channeler = (Unit::GetCreature(*m_creature, *itr))) Channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } @@ -743,7 +743,7 @@ struct npc_akamaAI : public ScriptedAI if (!BrokenList.empty()) { bool Yelled = false; - for (std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) if (Creature* pUnit = Unit::GetCreature(*m_creature, *itr)) { if (!Yelled) @@ -760,7 +760,7 @@ struct npc_akamaAI : public ScriptedAI case 3: if (!BrokenList.empty()) { - for (std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) if (Creature* pUnit = Unit::GetCreature(*m_creature, *itr)) // This is the incorrect spell, but can't seem to find the right one. pUnit->CastSpell(pUnit, 39656, true); @@ -771,7 +771,7 @@ struct npc_akamaAI : public ScriptedAI case 4: if (!BrokenList.empty()) { - for (std::list<uint64>::iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) + for (std::list<uint64>::const_iterator itr = BrokenList.begin(); itr != BrokenList.end(); ++itr) if (Creature* pUnit = Unit::GetCreature((*m_creature), *itr)) pUnit->MonsterYell(SAY_BROKEN_FREE_02, LANG_UNIVERSAL, 0); } diff --git a/src/scripts/outland/black_temple/boss_supremus.cpp b/src/scripts/outland/black_temple/boss_supremus.cpp index 24f75d5d1e0..c7cc7055ffa 100644 --- a/src/scripts/outland/black_temple/boss_supremus.cpp +++ b/src/scripts/outland/black_temple/boss_supremus.cpp @@ -150,7 +150,7 @@ struct boss_supremusAI : public ScriptedAI Unit *pTarget = NULL; std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostileReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp index c12bbd4249c..7be98d4b986 100644 --- a/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp +++ b/src/scripts/outland/black_temple/boss_teron_gorefiend.cpp @@ -145,7 +145,7 @@ struct mob_shadowy_constructAI : public ScriptedAI std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); if (m_threatlist.empty()) return; // No threat list. Don't continue. - std::list<HostileReference*>::iterator itr = m_threatlist.begin(); + std::list<HostileReference*>::const_iterator itr = m_threatlist.begin(); std::list<Unit*> targets; for (; itr != m_threatlist.end(); ++itr) { @@ -283,7 +283,7 @@ struct boss_teron_gorefiendAI : public ScriptedAI if (!Blossom) return; std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - std::list<HostileReference*>::iterator i = m_threatlist.begin(); + std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); for (i = m_threatlist.begin(); i != m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); diff --git a/src/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/scripts/outland/black_temple/boss_warlord_najentus.cpp index 230660214a8..12f1eb80975 100644 --- a/src/scripts/outland/black_temple/boss_warlord_najentus.cpp +++ b/src/scripts/outland/black_temple/boss_warlord_najentus.cpp @@ -175,7 +175,7 @@ struct boss_najentusAI : public ScriptedAI //DoCast(m_creature, SPELL_NEEDLE_SPINE, true); std::list<Unit*> pTargets; SelectTargetList(pTargets, 3, SELECT_TARGET_RANDOM, 80, true); - for (std::list<Unit*>::iterator i = pTargets.begin(); i != pTargets.end(); ++i) + for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i) DoCast(*i, 39835, true); events.ScheduleEvent(EVENT_NEEDLE, urand(15000,25000), GCD_CAST); events.DelayEvents(1500, GCD_CAST); diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index c3d50b78fda..9fc49e584cb 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -440,7 +440,7 @@ struct boss_lady_vashjAI : public ScriptedAI bool InMeleeRange = false; Unit *pTarget; std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //if in melee range diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 37b859a4097..02911782b1c 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -480,14 +480,14 @@ struct boss_leotheras_the_blindAI : public ScriptedAI { std::list<HostileReference *>& ThreatList = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> TargetList; - for (std::list<HostileReference *>::iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { Unit *tempTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != m_creature->getVictim()->GetGUID() && TargetList.size()<5) TargetList.push_back(tempTarget); } SpellEntry *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER); - for (std::vector<Unit *>::iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) + for (std::vector<Unit *>::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr) { if ((*itr) && (*itr)->isAlive()) { diff --git a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index ca4dfebb477..156d57cb47a 100644 --- a/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -223,7 +223,7 @@ struct boss_morogrim_tidewalkerAI : public ScriptedAI Unit *pTarget; using std::set; set<int>list; - set<int>::iterator itr; + set<int>::const_iterator itr; for (uint8 i = 0; i < 4; ++i) { counter = 0; @@ -262,7 +262,7 @@ struct boss_morogrim_tidewalkerAI : public ScriptedAI Unit* pGlobuleTarget; using std::set; set<int>globulelist; - set<int>::iterator itr; + set<int>::const_iterator itr; for (uint8 g = 0; g < 4; g++) //one unit can't cast more than one spell per update, so some players have to cast for us XD { counter = 0; diff --git a/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp b/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp index 528e294b156..9be8d3294d5 100644 --- a/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp +++ b/src/scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp @@ -78,7 +78,7 @@ struct boss_the_black_stalkerAI : public ScriptedAI void JustDied(Unit *who) { - for (std::list<uint64>::iterator i = Striders.begin(); i != Striders.end(); ++i) + for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i) if (Creature *strider = Unit::GetCreature(*m_creature, *i)) strider->DisappearAndDie(); } diff --git a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp index 4e586b2057f..2af55ffa15e 100644 --- a/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp +++ b/src/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp @@ -708,7 +708,7 @@ struct boss_krosh_firehandAI : public ScriptedAI Unit *pTarget; std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); //15 yard radius minimum diff --git a/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index aabb4e86a3a..cb072c1d74b 100644 --- a/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -135,7 +135,7 @@ struct instance_magtheridons_lair : public ScriptedInstance if (m_auiEncounter[1] != NOT_STARTED) { m_auiEncounter[1] = NOT_STARTED; - for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) { if (Creature *Channeler = instance->GetCreature(*i)) { @@ -154,7 +154,7 @@ struct instance_magtheridons_lair : public ScriptedInstance { m_auiEncounter[1] = IN_PROGRESS; // Let all five channelers aggro. - for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) { Creature *Channeler = instance->GetCreature(*i); if (Channeler && Channeler->isAlive()) @@ -171,7 +171,7 @@ struct instance_magtheridons_lair : public ScriptedInstance } break; case DONE: // Add buff and check if all channelers are dead. - for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) { Creature *Channeler = instance->GetCreature(*i); if (Channeler && Channeler->isAlive()) @@ -187,7 +187,7 @@ struct instance_magtheridons_lair : public ScriptedInstance break; case DATA_COLLAPSE: // true - collapse / false - reset - for (std::set<uint64>::iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i) + for (std::set<uint64>::const_iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i) DoUseDoorOrButton(*i); break; default: @@ -222,7 +222,7 @@ struct instance_magtheridons_lair : public ScriptedInstance { if (RespawnTimer <= diff) { - for (std::set<uint64>::iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) + for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i) { if (Creature *Channeler = instance->GetCreature(*i)) { diff --git a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp index 5c7ce1d1aef..0b1b3ab8428 100644 --- a/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp +++ b/src/scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp @@ -144,7 +144,7 @@ struct boss_warchief_kargath_bladefistAI : public ScriptedAI void removeAdds() { - for (std::vector<uint64>::iterator itr = adds.begin(); itr!= adds.end(); ++itr) + for (std::vector<uint64>::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr) { Unit* temp = Unit::GetUnit((*m_creature),*itr); if (temp && temp->isAlive()) @@ -156,7 +156,7 @@ struct boss_warchief_kargath_bladefistAI : public ScriptedAI } adds.clear(); - for (std::vector<uint64>::iterator itr = assassins.begin(); itr!= assassins.end(); ++itr) + for (std::vector<uint64>::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr) { Unit* temp = Unit::GetUnit((*m_creature),*itr); if (temp && temp->isAlive()) diff --git a/src/scripts/outland/netherstorm.cpp b/src/scripts/outland/netherstorm.cpp index 25dba020be4..992a4f2dc85 100644 --- a/src/scripts/outland/netherstorm.cpp +++ b/src/scripts/outland/netherstorm.cpp @@ -79,7 +79,7 @@ struct npc_manaforge_control_consoleAI : public ScriptedAI Wave = false; someplayer = 0; goConsole = 0; - Creature* add = NULL; + add = NULL; } void EnterCombat(Unit *who) { return; } @@ -296,8 +296,7 @@ bool GOHello_go_manaforge_control_console(Player* pPlayer, GameObject* pGo) pPlayer->SendPreparedQuest(pGo->GetGUID()); } - Creature* manaforge; - manaforge = NULL; + Creature* manaforge = NULL; switch(pGo->GetAreaId()) { @@ -696,6 +695,7 @@ struct mob_phase_hunterAI : public ScriptedAI float HpPercent; Player *pPlayer; + uint64 PlayerGUID; uint32 ManaBurnTimer; @@ -707,7 +707,7 @@ struct mob_phase_hunterAI : public ScriptedAI WeakPercent = 25 + (rand() % 16); // 25-40 HpPercent = 0.0f; - pPlayer = NULL; + PlayerGUID = 0; ManaBurnTimer = 5000 + (rand() % 3 * 1000); // 5-8 sec cd @@ -718,7 +718,7 @@ struct mob_phase_hunterAI : public ScriptedAI void EnterCombat(Unit *who) { if (who->GetTypeId() == TYPEID_PLAYER) - pPlayer = CAST_PLR(who); + PlayerGUID = who->GetGUID(); } void SpellHit(Unit *caster, const SpellEntry *spell) @@ -765,7 +765,7 @@ struct mob_phase_hunterAI : public ScriptedAI ManaBurnTimer = 3500; } else ManaBurnTimer -= diff; - if (pPlayer) // start: support for quest 10190 + if (Player *pPlayer = Unit::GetPlayer(PlayerGUID)) // start: support for quest 10190 { if (!Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) && pPlayer->GetQuestStatus(QUEST_RECHARGING_THE_BATTERIES) == QUEST_STATUS_INCOMPLETE) diff --git a/src/scripts/outland/shadowmoon_valley.cpp b/src/scripts/outland/shadowmoon_valley.cpp index cd9a253d4cb..3a6a86613f9 100644 --- a/src/scripts/outland/shadowmoon_valley.cpp +++ b/src/scripts/outland/shadowmoon_valley.cpp @@ -1496,7 +1496,7 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI const Group::MemberSlotList members = EventGroup->GetMemberSlots(); - for (Group::member_citerator itr = members.begin(); itr!= members.end(); itr++) + for (Group::member_citerator itr = members.begin(); itr!= members.end(); ++itr) { GroupMember = (Unit::GetPlayer(itr->guid)); if (!GroupMember) @@ -1522,7 +1522,7 @@ struct npc_lord_illidan_stormrageAI : public ScriptedAI if (GroupMemberCount == DeadMemberCount) { - for (Group::member_citerator itr = members.begin(); itr!= members.end(); itr++) + for (Group::member_citerator itr = members.begin(); itr!= members.end(); ++itr) { GroupMember = Unit::GetPlayer(itr->guid); diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp index 0fc0c57d2e2..2f56606a031 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp @@ -851,7 +851,7 @@ struct boss_kaelthasAI : public ScriptedAI //GravityLapse_Timer if (GravityLapse_Timer <= diff) { - std::list<HostileReference*>::iterator i = m_creature->getThreatManager().getThreatList().begin(); + std::list<HostileReference*>::const_iterator i = m_creature->getThreatManager().getThreatList().begin(); switch (GravityLapse_Phase) { case 0: @@ -1197,7 +1197,7 @@ struct boss_grand_astromancer_capernianAI : public advisorbase_ai bool InMeleeRange = false; Unit *pTarget = NULL; std::list<HostileReference*>& m_threatlist = m_creature->getThreatManager().getThreatList(); - for (std::list<HostileReference*>::iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) + for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i!= m_threatlist.end(); ++i) { Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()); //if in melee range diff --git a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp index 84dd5af73d0..e6823106ad8 100644 --- a/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp @@ -111,7 +111,7 @@ struct boss_void_reaverAI : public ScriptedAI Unit *pTarget = NULL; std::list<HostileReference *> t_list = m_creature->getThreatManager().getThreatList(); std::vector<Unit *> target_list; - for (std::list<HostileReference *>::iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) + for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr) { pTarget = Unit::GetUnit(*m_creature, (*itr)->getUnitGuid()); if (!pTarget) diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp index 839a4154ed3..977a57a9dd2 100644 --- a/src/scripts/world/npcs_special.cpp +++ b/src/scripts/world/npcs_special.cpp @@ -738,7 +738,7 @@ void npc_doctorAI::PatientSaved(Creature* soldier, Player* pPlayer, Location* Po { if (!Patients.empty()) { - std::list<uint64>::iterator itr; + std::list<uint64>::const_iterator itr; for (itr = Patients.begin(); itr != Patients.end(); ++itr) { if (Creature* Patient = Unit::GetCreature((*m_creature), *itr)) @@ -1804,7 +1804,7 @@ struct npc_ebon_gargoyleAI : CasterAI Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(m_creature, m_creature, 30); Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(m_creature, targets, u_check); m_creature->VisitNearbyObject(30, searcher); - for (std::list<Unit*>::iterator iter = targets.begin(); iter != targets.end(); ++iter) + for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) if((*iter)->GetAura(49206,owner->GetGUID())) { me->Attack((*iter),false); |