diff options
| author | Spp <spp@jorge.gr> | 2013-03-21 13:48:36 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-03-21 13:48:36 +0100 |
| commit | 156fb824a437ea01b207cce37405bfa8a24624e5 (patch) | |
| tree | 2391db77b8b27c70f771d8a400845660a7f9eaec /src/server/scripts/Kalimdor | |
| parent | 355029fb4f30a3d535a7c360b896b728eee330b6 (diff) | |
Core/Scripts: Removed CAST_CRE define
Diffstat (limited to 'src/server/scripts/Kalimdor')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 3f186c96d40..a7d4a7087f8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -960,12 +960,12 @@ void hyjalAI::WaypointReached(uint32 waypointId) DoCast(me, SPELL_MASS_TELEPORT, false); if (me->GetEntry() == THRALL && DummyGuid) { - Unit* Dummy = Unit::GetUnit(*me, DummyGuid); - if (Dummy) + if (Creature* creature = Unit::GetCreature(*me, DummyGuid)) { - CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true; - CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->MassTeleportTimer = 20000; - Dummy->CastSpell(me, SPELL_MASS_TELEPORT, false); + hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); + ai->DoMassTeleport = true; + ai->MassTeleportTimer = 20000; + creature->CastSpell(me, SPELL_MASS_TELEPORT, false); } } //do some talking diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index adb89ba5a69..630c379e71e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -191,7 +191,7 @@ hyjal_trashAI::hyjal_trashAI(Creature* creature) : npc_escortAI(creature) void hyjal_trashAI::DamageTaken(Unit* done_by, uint32 &damage) { - if (done_by->GetTypeId() == TYPEID_PLAYER || (done_by->GetTypeId() == TYPEID_UNIT && CAST_CRE(done_by)->isPet())) + if (done_by->GetTypeId() == TYPEID_PLAYER || done_by->isPet()) { damageTaken += damage; if (instance) diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index b48fbb2f1ae..2b68c0a2cb6 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -204,7 +204,7 @@ protected: /// Will be called when a dialogue step was done virtual void JustDidDialogueStep(int32 /*entry*/) {} /// Will be called to get a speaker, MUST be implemented if not used in instances - virtual Creature* GetSpeakerByEntry(uint32 /*entry*/) { return NULL; } + virtual Creature* GetSpeakerByEntry(int32 /*entry*/) { return NULL; } private: void DoNextDialogueStep() |