mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9207] Fixed chase/follow functions calls in movegen templates system.

Browse source 
This commit specially made indeepndent from other changes for show problem
in my prev. commit where 2 new movegens added.

For proper call Initilize/Finilize/Reset/Interrupt/Update functions _important_
set second template arg in MovementGeneratorMedium< T, D >
in _last_ class in class chain. In other case in chase/follow instead TargetedMovementGeneratorMedium
In other cases will called referenced functions from TargetedMovementGeneratorMedium
instead proper subclasses.
This commit is contained in:
VladimirMangos 2010-01-18 10:29:28 +03:00
parent 98adbbc3d3
commit 7d6b1b292e
3 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/game/TargetedMovementGenerator.cpp
View file

@ -28,8 +28,8 @@
#include <cmath>
//-----------------------------------------------//
template<class T>
void TargetedMovementGeneratorMedium<T>::_setTargetLocation(T &owner)
template<class T, typename D>
void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T &owner)
{
if (!i_target.isValid() || !i_target->IsInWorld())
return;
@ -77,26 +77,33 @@ void TargetedMovementGeneratorMedium<T>::_setTargetLocation(T &owner)
}
template<>
void TargetedMovementGeneratorMedium<Player>::UpdateFinalDistance(float fDistance)
void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::UpdateFinalDistance(float fDistance)
{
// nothing to do for Player
}
template<>
void TargetedMovementGeneratorMedium<Creature>::UpdateFinalDistance(float fDistance)
void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::UpdateFinalDistance(float fDistance)
{
// nothing to do for Player
}
template<>
void TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::UpdateFinalDistance(float fDistance)
{
i_offset = fDistance;
i_recalculateTravel = true;
}
template<class T>
Unit* TargetedMovementGeneratorMedium<T>::GetTarget() const
template<>
void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::UpdateFinalDistance(float fDistance)
{
return i_target.getTarget();
i_offset = fDistance;
i_recalculateTravel = true;
}
template<class T>
bool TargetedMovementGeneratorMedium<T>::Update(T &owner, const uint32 & time_diff)
template<class T, typename D>
bool TargetedMovementGeneratorMedium<T,D>::Update(T &owner, const uint32 & time_diff)
{
if (!i_target.isValid() || !i_target->IsInWorld())
return false;
@ -236,10 +243,14 @@ void FollowMovementGenerator<T>::Reset(T &owner)
}
//-----------------------------------------------//
template Unit* TargetedMovementGeneratorMedium<Player>::GetTarget() const;
template Unit* TargetedMovementGeneratorMedium<Creature>::GetTarget() const;
template bool TargetedMovementGeneratorMedium<Player>::Update(Player &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Creature>::Update(Creature &, const uint32 &);
template void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::_setTargetLocation(Player &);
template void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::_setTargetLocation(Player &);
template void TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::_setTargetLocation(Creature &);
template void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::_setTargetLocation(Creature &);
template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::Update(Player &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::Update(Player &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::Update(Creature &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::Update(Creature &, const uint32 &);
template void ChaseMovementGenerator<Player>::Finalize(Player &);
template void ChaseMovementGenerator<Creature>::Finalize(Creature &);