diff options
Diffstat (limited to 'src')
4 files changed, 12 insertions, 6 deletions
diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp index d43311a30fd..dbf43c06bc6 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -405,11 +405,11 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI damage /= 4; for(uint8 i = 0; i < 4; ++i) { - if(Unit* pUnit = Unit::GetUnit(*m_creature, Council[i])) + if(Creature* pUnit = Unit::GetCreature(*m_creature, Council[i])) if(pUnit != m_creature && damage < pUnit->GetHealth()) { pUnit->SetHealth(pUnit->GetHealth() - damage); - ((Creature*)pUnit)->LowerPlayerDamageReq(damage); + pUnit->LowerPlayerDamageReq(damage); } } } diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index 0225773652f..2ab878a5a72 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI { boss_morogrim_tidewalkerAI(Creature* pCreature) : ScriptedAI(pCreature) { - m_pInstance = ((ScriptedInstance*)pCreature->GetInstanceData()); + m_pInstance = pCreature->GetInstanceData(); } ScriptedInstance* m_pInstance; // the instance diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index b754247b4a4..cbf5bd31d20 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -82,8 +82,11 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance } - void OnCreatureCreate(Creature *creature, uint32 creature_entry) + void OnCreatureCreate(Creature *creature, bool add) { + if(!add) + return; + switch(creature->GetEntry()) { case 17381: The_MakerGUID = creature->GetGUID(); break; @@ -92,8 +95,11 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance } } - void OnObjectCreate(GameObject *go) + void OnGameObjectCreate(GameObject *go, bool add) { + if(!add) + return; + if (go->GetEntry() == 181766) //Final exit door Door1GUID = go->GetGUID(); if (go->GetEntry() == 181811) //The Maker Front door diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index c952c1057f7..d1753d20960 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -117,7 +117,7 @@ bool QuestAccept_npc_bartleby(Player* pPlayer, Creature* pCreature, Quest const* if (pQuest->GetQuestId() == QUEST_BEAT) { pCreature->setFaction(FACTION_ENEMY); - ((npc_bartlebyAI*)pCreature->AI())->AttackStart(pPlayer); + pCreature->AI()->AttackStart(pPlayer); } return true; } |