From 0a4f18fab380ce210a215374b4df8f241ea50aab Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 22 Jul 2011 20:10:48 +0200 Subject: Compile fix and removed unneeded call in HomeMovementGenerator initialization --- .../MovementGenerators/HomeMovementGenerator.cpp | 18 +++++------------- .../scripts/Northrend/IcecrownCitadel/boss_rotface.cpp | 10 +++------- 2 files changed, 8 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp index e8cb46e2a1d..5e1cd26d7e8 100755 --- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp @@ -23,29 +23,23 @@ #include "DestinationHolderImp.h" #include "WorldPacket.h" -void -HomeMovementGenerator::Initialize(Creature & owner) +void HomeMovementGenerator::Initialize(Creature & owner) { - float x, y, z; - owner.GetHomePosition(x, y, z, ori); owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); owner.AddUnitState(UNIT_STAT_EVADE); _setTargetLocation(owner); } -void -HomeMovementGenerator::Finalize(Creature & owner) +void HomeMovementGenerator::Finalize(Creature & owner) { owner.ClearUnitState(UNIT_STAT_EVADE); } -void -HomeMovementGenerator::Reset(Creature &) +void HomeMovementGenerator::Reset(Creature &) { } -void -HomeMovementGenerator::_setTargetLocation(Creature & owner) +void HomeMovementGenerator::_setTargetLocation(Creature & owner) { if (!&owner) return; @@ -63,8 +57,7 @@ HomeMovementGenerator::_setTargetLocation(Creature & owner) owner.ClearUnitState(uint32(UNIT_STAT_ALL_STATE & ~UNIT_STAT_EVADE)); } -bool -HomeMovementGenerator::Update(Creature &owner, const uint32& time_diff) +bool HomeMovementGenerator::Update(Creature &owner, const uint32& time_diff) { CreatureTraveller traveller(owner); i_destinationHolder.UpdateTraveller(traveller, time_diff); @@ -93,4 +86,3 @@ HomeMovementGenerator::Update(Creature &owner, const uint32& time_diff return true; } - diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 2275bbe3bdc..29c034c5ed5 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -375,6 +375,9 @@ class npc_precious_icc : public CreatureScript void JustDied(Unit* /*killer*/) { _summons.DespawnAll(); + if (Creature* rotface = Unit::GetCreature(*me, _instance->GetData64(DATA_ROTFACE))) + if (rotface->isAlive()) + rotface->AI()->Talk(SAY_PRECIOUS_DIES); } void UpdateAI(const uint32 diff) @@ -413,13 +416,6 @@ class npc_precious_icc : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*who*/) - { - if (Creature* rotface = Unit::GetCreature(*me, _instance->GetData64(DATA_ROTFACE))) - if (rotface->isAlive()) - rotface->AI()->Talk(SAY_PRECIOUS_DIES); - } - private: EventMap _events; SummonList _summons; -- cgit v1.2.3