aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-07-22 20:10:48 +0200
committerShauren <shauren.trinity@gmail.com>2011-07-22 20:10:48 +0200
commit0a4f18fab380ce210a215374b4df8f241ea50aab (patch)
tree1147db7ed11e177c0d7bdf88d8db0abe740d1203 /src
parent4c9269cd54c4d360fa7e25bc4f3d90603528ee93 (diff)
Compile fix and removed unneeded call in HomeMovementGenerator initialization
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp18
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp10
2 files changed, 8 insertions, 20 deletions
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<Creature>::Initialize(Creature & owner)
+void HomeMovementGenerator<Creature>::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<Creature>::Finalize(Creature & owner)
+void HomeMovementGenerator<Creature>::Finalize(Creature & owner)
{
owner.ClearUnitState(UNIT_STAT_EVADE);
}
-void
-HomeMovementGenerator<Creature>::Reset(Creature &)
+void HomeMovementGenerator<Creature>::Reset(Creature &)
{
}
-void
-HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
+void HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
{
if (!&owner)
return;
@@ -63,8 +57,7 @@ HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
owner.ClearUnitState(uint32(UNIT_STAT_ALL_STATE & ~UNIT_STAT_EVADE));
}
-bool
-HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff)
+bool HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff)
{
CreatureTraveller traveller(owner);
i_destinationHolder.UpdateTraveller(traveller, time_diff);
@@ -93,4 +86,3 @@ HomeMovementGenerator<Creature>::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;