diff options
Diffstat (limited to 'src')
9 files changed, 36 insertions, 34 deletions
diff --git a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp index 2189cf60c6f..73eb2ebdc40 100644 --- a/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp +++ b/src/bindings/scripts/scripts/creature/mob_generic_creature.cpp @@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL mob_webwrapAI : public NullCreatureAI uint64 victimGUID; - void SetGUID(const uint64 &guid, const int32 param) + void SetGUID(const uint64 &guid, int32 param) { victimGUID = guid; if(me->m_spells[0] && victimGUID) diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 41aca98d1a9..270b7c7cfc5 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -1734,7 +1734,7 @@ struct TRINITY_DLL_DECL mob_parasitic_shadowfiendAI : public ScriptedAI && !m_creature->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2)) { if(Creature* illidan = Unit::GetCreature((*m_creature),IllidanGUID))//summon only in 1. phase - if(((boss_illidan_stormrageAI*)illidan->AI())->Phase == PHASE_NORMAL) + if(CAST_AI(boss_illidan_stormrageAI, illidan->AI())->Phase == PHASE_NORMAL) m_creature->CastSpell(m_creature->getVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); //do not stack } m_creature->AttackerStateUpdate(m_creature->getVictim()); diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp index 4391a748b8c..c9f35964fa8 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp @@ -329,7 +329,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI { if (NefCheckTime < diff) { - Unit* Nefarian = (Creature*)Unit::GetUnit((*m_creature),NefarianGUID); + Unit* Nefarian = Unit::GetCreature((*m_creature),NefarianGUID); //If nef is dead then we die to so the players get out of combat //and cannot repeat the event diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp index e523fc1dea6..d28e2620138 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI { boss_scarlet_commander_mograineAI(Creature* pCreature) : ScriptedAI(pCreature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); } ScriptedInstance* m_pInstance; @@ -209,7 +209,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI { boss_high_inquisitor_whitemaneAI(Creature* pCreature) : ScriptedAI(pCreature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); } ScriptedInstance* m_pInstance; @@ -301,7 +301,7 @@ struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI if (m_pInstance) { - if (Creature* pMograine = (Creature*)Unit::GetUnit((*m_creature), m_pInstance->GetData64(DATA_MOGRAINE))) + if (Creature* pMograine = Unit::GetCreature((*m_creature), m_pInstance->GetData64(DATA_MOGRAINE))) { // checking m_bCanResurrectCheck prevents her healing Mograine while he is "faking death" if (m_bCanResurrectCheck && pMograine->isAlive() && pMograine->GetHealth() <= pMograine->GetMaxHealth()*0.75f) diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp index 8edff6136c7..5856ab5b09f 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI { advisorbase_ai(Creature* pCreature) : ScriptedAI(pCreature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); m_bDoubled_Health = false; } @@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI //reset encounter if (m_pInstance && (m_pInstance->GetData(DATA_KAELTHASEVENT) == 1 || m_pInstance->GetData(DATA_KAELTHASEVENT) == 3)) { - if (Creature *Kaelthas = (Creature*)Unit::GetUnit((*m_creature), m_pInstance->GetData64(DATA_KAELTHAS))) + if (Creature *Kaelthas = Unit::GetCreature((*m_creature), m_pInstance->GetData64(DATA_KAELTHAS))) Kaelthas->AI()->EnterEvadeMode(); } } @@ -273,7 +273,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { boss_kaelthasAI(Creature* pCreature) : ScriptedAI(pCreature), summons(m_creature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid)); } @@ -336,7 +336,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI { for(uint8 i = 0; i < MAX_ADVISORS; i++) { - if (Creature *pCreature = (Creature*)Unit::GetUnit((*m_creature), m_auiAdvisorGuid[i])) + if (Creature *pCreature = Unit::GetCreature((*m_creature), m_auiAdvisorGuid[i])) { pCreature->Respawn(); pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -494,7 +494,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI case 1: if (Phase_Timer < diff) { - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[0])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[0])); if (Advisor) { @@ -512,7 +512,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Subphase 2 - Start case 2: - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[0])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[0])); if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) { @@ -528,7 +528,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI case 3: if (Phase_Timer < diff) { - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[1])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[1])); if (Advisor) { @@ -546,7 +546,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Subphase 3 - Start case 4: - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[1])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[1])); if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) { @@ -562,7 +562,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI case 5: if (Phase_Timer < diff) { - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[2])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[2])); if (Advisor) { @@ -580,7 +580,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //Subphase 4 - Start case 6: - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[2])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[2])); if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) { @@ -596,7 +596,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI case 7: if (Phase_Timer < diff) { - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[3])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[3])); if (Advisor) { @@ -615,7 +615,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI //End of phase 1 case 8: - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[3])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[3])); if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) { @@ -678,12 +678,12 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI Creature* Advisor; for (uint32 i = 0; i < MAX_ADVISORS; i++) { - Advisor = (Creature*)(Unit::GetUnit((*m_creature), m_auiAdvisorGuid[i])); + Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[i])); if (!Advisor) error_log("SD2: Kael'Thas Advisor %u does not exist. Possibly despawned? Incorrectly Killed?", i); else - ((advisorbase_ai*)Advisor->AI())->Revive(Target); + CAST_AI(advisorbase_ai, Advisor->AI())->Revive(Target); } PhaseSubphase = 1; diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp index f0a20dea716..5b6301019a5 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_bjarngrim.cpp @@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_bjarngrimAI : public ScriptedAI for(uint8 i = 0; i < 2; ++i) { - if (Creature* pStormforgedLieutenant = ((Creature*)Unit::GetUnit((*m_creature), m_uiStormforgedLieutenantGUID[i]))) + if (Creature* pStormforgedLieutenant = (Unit::GetCreature((*m_creature), m_uiStormforgedLieutenantGUID[i]))) { if (!pStormforgedLieutenant->isAlive()) pStormforgedLieutenant->Respawn(); diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp index 6ac58c4aefd..227d23b154a 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_ionar.cpp @@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI { boss_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); m_bIsHeroic = pCreature->GetMap()->IsHeroic(); Reset(); } @@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI for(std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr) { - if (Creature* pTemp = (Creature*)Unit::GetUnit(*m_creature, *itr)) + if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) { if (pTemp->isAlive()) pTemp->ForcedDespawn(); @@ -181,7 +181,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI for(std::list<uint64>::iterator itr = m_lSparkGUIDList.begin(); itr != m_lSparkGUIDList.end(); ++itr) { - if (Creature* pSpark = (Creature*)Unit::GetUnit(*m_creature, *itr)) + if (Creature* pSpark = Unit::GetCreature(*m_creature, *itr)) { if (pSpark->isAlive()) { @@ -345,7 +345,7 @@ struct TRINITY_DLL_DECL mob_spark_of_ionarAI : public ScriptedAI { mob_spark_of_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); Reset(); } diff --git a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp index c3d07e42043..35eadb9783e 100644 --- a/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp +++ b/src/bindings/scripts/scripts/zone/ulduar/halls_of_lightning/boss_volkhan.cpp @@ -74,7 +74,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI { boss_volkhanAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); m_bIsHeroic = pCreature->GetMap()->IsHeroic(); Reset(); } @@ -160,7 +160,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI for(std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) { - if (Creature* pTemp = (Creature*)Unit::GetUnit(*m_creature, *itr)) + if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) { if (pTemp->isAlive()) pTemp->ForcedDespawn(); @@ -177,7 +177,7 @@ struct TRINITY_DLL_DECL boss_volkhanAI : public ScriptedAI for(std::list<uint64>::iterator itr = m_lGolemGUIDList.begin(); itr != m_lGolemGUIDList.end(); ++itr) { - if (Creature* pTemp = (Creature*)Unit::GetUnit(*m_creature, *itr)) + if (Creature* pTemp = Unit::GetCreature(*m_creature, *itr)) { // only shatter brittle golems if (pTemp->isAlive() && pTemp->GetEntry() == NPC_BRITTLE_GOLEM) @@ -334,6 +334,8 @@ bool EffectDummyCreature_npc_volkhan_anvil(Unit* pCaster, uint32 uiSpellId, uint if (pCaster->GetEntry() != NPC_VOLKHAN || pCreatureTarget->GetEntry() != NPC_VOLKHAN_ANVIL) return true; + Creature *cre = CAST_CRE(pCaster); + DoScriptText(EMOTE_TO_ANVIL, pCaster); float fX, fY, fZ; @@ -344,8 +346,8 @@ bool EffectDummyCreature_npc_volkhan_anvil(Unit* pCaster, uint32 uiSpellId, uint if (pCaster->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE) pCaster->GetMotionMaster()->MovementExpired(); - ((Creature*)pCaster)->GetMap()->CreatureRelocation((Creature*)pCaster, fX, fY, fZ, pCreatureTarget->GetOrientation()); - ((Creature*)pCaster)->SendMonsterMove(fX, fY, fZ, 0, ((Creature*)pCaster)->GetUnitMovementFlags(), 1); + cre->GetMap()->CreatureRelocation(cre, fX, fY, fZ, pCreatureTarget->GetOrientation()); + cre->SendMonsterMove(fX, fY, fZ, 0, cre->GetUnitMovementFlags(), 1); pCreatureTarget->CastSpell(pCaster, SPELL_TEMPER_DUMMY, false); @@ -364,7 +366,7 @@ struct TRINITY_DLL_DECL mob_molten_golemAI : public ScriptedAI { mob_molten_golemAI(Creature *pCreature) : ScriptedAI(pCreature) { - m_pInstance = (ScriptedInstance*)pCreature->GetInstanceData(); + m_pInstance = pCreature->GetInstanceData(); m_bIsHeroic = pCreature->GetMap()->IsHeroic(); Reset(); } diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp index e4244c1d857..8fae2895a07 100644 --- a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp @@ -193,7 +193,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI eventProgress++; DoScriptText(SAY_BANISH_THE_SPIRITS, m_creature); DoCast(m_creature, SPELL_SERPENTINE_CLEANSING); - ((npc_escortAI*)m_creature->AI())->SetCanDefend(false); + CAST_AI(npc_escortAI, m_creature->AI())->SetCanDefend(false); eventTimer = 30000; m_creature->SummonCreature(NPC_DEVIATE_VIPER, -61.5261, 273.676, -92.8442, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); m_creature->SummonCreature(NPC_DEVIATE_VIPER, -58.4658, 280.799, -92.8393, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); @@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI else if (eventProgress == 2) { - ((npc_escortAI*)m_creature->AI())->SetCanDefend(true); + CAST_AI(npc_escortAI, m_creature->AI())->SetCanDefend(true); DoScriptText(SAY_CAVERNS_PURIFIED, m_creature); pInstance->SetData(TYPE_NARALEX_PART2, DONE); if (m_creature->HasAura(SPELL_SERPENTINE_CLEANSING)) @@ -222,7 +222,7 @@ struct TRINITY_DLL_DECL npc_disciple_of_naralexAI : public npc_escortAI { eventProgress++; eventTimer = 15000; - ((npc_escortAI*)m_creature->AI())->SetCanDefend(false); + CAST_AI(npc_escortAI, m_creature->AI())->SetCanDefend(false); if (Creature* naralex = pInstance->instance->GetCreature(pInstance->GetData64(DATA_NARALEX))) DoCast(naralex, SPELL_NARALEXS_AWAKENING, true); DoScriptText(EMOTE_AWAKENING_RITUAL, m_creature); |