diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp index d6b746196..f54e99cb7 100644 --- a/src/game/PointMovementGenerator.cpp +++ b/src/game/PointMovementGenerator.cpp @@ -82,21 +82,26 @@ bool PointMovementGenerator::Update(T &unit, const uint32 &diff) return true; } -template -void PointMovementGenerator::MovementInform(T& /*unit*/) +template<> +void PointMovementGenerator::MovementInform(Player&) { } -template <> void PointMovementGenerator::MovementInform(Creature &unit) +template <> +void PointMovementGenerator::MovementInform(Creature &unit) { unit.AI()->MovementInform(POINT_MOTION_TYPE, id); } template void PointMovementGenerator::Initialize(Player&); -template bool PointMovementGenerator::Update(Player &, const uint32 &diff); -template void PointMovementGenerator::MovementInform(Player&); - template void PointMovementGenerator::Initialize(Creature&); +template void PointMovementGenerator::Finalize(Player&); +template void PointMovementGenerator::Finalize(Creature&); +template void PointMovementGenerator::Interrupt(Player&); +template void PointMovementGenerator::Interrupt(Creature&); +template void PointMovementGenerator::Reset(Player&); +template void PointMovementGenerator::Reset(Creature&); +template bool PointMovementGenerator::Update(Player &, const uint32 &diff); template bool PointMovementGenerator::Update(Creature&, const uint32 &diff); void AssistanceMovementGenerator::Finalize(Unit &unit) diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index 83862e24d..098907396 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -184,8 +184,8 @@ bool TargetedMovementGeneratorMedium::Update(T &owner, const uint32 & time_ template void ChaseMovementGenerator::_reachTarget(T &owner) { - if(owner.canReachWithAttack(i_target.getTarget())) - owner.Attack(i_target.getTarget(),true); + if(owner.canReachWithAttack(this->i_target.getTarget())) + owner.Attack(this->i_target.getTarget(),true); } template<> diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h index 0c2d9e33c..68355f63d 100644 --- a/src/game/TargetedMovementGenerator.h +++ b/src/game/TargetedMovementGenerator.h @@ -89,7 +89,7 @@ class MANGOS_DLL_SPEC ChaseMovementGenerator : public TargetedMovementGeneratorM static void _clearUnitStateMove(T &u) { u.clearUnitState(UNIT_STAT_CHASE_MOVE); } static void _addUnitStateMove(T &u) { u.addUnitState(UNIT_STAT_CHASE_MOVE); } - bool _lostTarget(T &u) const { return u.getVictim() != GetTarget(); } + bool _lostTarget(T &u) const { return u.getVictim() != this->GetTarget(); } void _reachTarget(T &); }; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8b29a0301..391a49791 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9210" + #define REVISION_NR "9211" #endif // __REVISION_NR_H__