josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix and removed unneeded call in HomeMovementGenerator initialization

Browse Source
This commit is contained in:
Shauren
2011-07-22 20:10:48 +02:00
parent 4c9269cd54
commit 0a4f18fab3
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
+5 -13
View File
@@ -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;
}
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+3 -7
View File
@@ -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;