Compile fix and removed unneeded call in HomeMovementGenerator initialization
This commit is contained in:
@@ -23,29 +23,23 @@
|
|||||||
#include "DestinationHolderImp.h"
|
#include "DestinationHolderImp.h"
|
||||||
#include "WorldPacket.h"
|
#include "WorldPacket.h"
|
||||||
|
|
||||||
void
|
void HomeMovementGenerator<Creature>::Initialize(Creature & owner)
|
||||||
HomeMovementGenerator<Creature>::Initialize(Creature & owner)
|
|
||||||
{
|
{
|
||||||
float x, y, z;
|
|
||||||
owner.GetHomePosition(x, y, z, ori);
|
|
||||||
owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
|
owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
|
||||||
owner.AddUnitState(UNIT_STAT_EVADE);
|
owner.AddUnitState(UNIT_STAT_EVADE);
|
||||||
_setTargetLocation(owner);
|
_setTargetLocation(owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void HomeMovementGenerator<Creature>::Finalize(Creature & owner)
|
||||||
HomeMovementGenerator<Creature>::Finalize(Creature & owner)
|
|
||||||
{
|
{
|
||||||
owner.ClearUnitState(UNIT_STAT_EVADE);
|
owner.ClearUnitState(UNIT_STAT_EVADE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void HomeMovementGenerator<Creature>::Reset(Creature &)
|
||||||
HomeMovementGenerator<Creature>::Reset(Creature &)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
|
||||||
HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
|
|
||||||
{
|
{
|
||||||
if (!&owner)
|
if (!&owner)
|
||||||
return;
|
return;
|
||||||
@@ -63,8 +57,7 @@ HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
|
|||||||
owner.ClearUnitState(uint32(UNIT_STAT_ALL_STATE & ~UNIT_STAT_EVADE));
|
owner.ClearUnitState(uint32(UNIT_STAT_ALL_STATE & ~UNIT_STAT_EVADE));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff)
|
||||||
HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff)
|
|
||||||
{
|
{
|
||||||
CreatureTraveller traveller(owner);
|
CreatureTraveller traveller(owner);
|
||||||
i_destinationHolder.UpdateTraveller(traveller, time_diff);
|
i_destinationHolder.UpdateTraveller(traveller, time_diff);
|
||||||
@@ -93,4 +86,3 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -375,6 +375,9 @@ class npc_precious_icc : public CreatureScript
|
|||||||
void JustDied(Unit* /*killer*/)
|
void JustDied(Unit* /*killer*/)
|
||||||
{
|
{
|
||||||
_summons.DespawnAll();
|
_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)
|
void UpdateAI(const uint32 diff)
|
||||||
@@ -413,13 +416,6 @@ class npc_precious_icc : public CreatureScript
|
|||||||
DoMeleeAttackIfReady();
|
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:
|
private:
|
||||||
EventMap _events;
|
EventMap _events;
|
||||||
SummonList _summons;
|
SummonList _summons;
|
||||||
|
|||||||
Reference in New Issue
Block a user