diff options
author | megamage <none@none> | 2009-02-04 10:53:58 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-02-04 10:53:58 -0600 |
commit | df7499e0565116c356308839079c36943ba7949c (patch) | |
tree | 5c7b362962dc49e95601eea5ccfe5102b370639d /src/game/WaypointMovementGenerator.h | |
parent | 50c82c666093b5dac3cd60cddf9f46223a48d8d9 (diff) | |
parent | 6b19b789ca1757b99a5eaf37fba7c3f555347ab1 (diff) |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/WaypointMovementGenerator.h')
-rw-r--r-- | src/game/WaypointMovementGenerator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h index 21163ded11c..e08a83ba8a6 100644 --- a/src/game/WaypointMovementGenerator.h +++ b/src/game/WaypointMovementGenerator.h @@ -53,7 +53,7 @@ class TRINITY_DLL_SPEC PathMovementBase void LoadPath(T &); void ReloadPath(T &); uint32 GetCurrentNode() const { return i_currentNode; } - + protected: uint32 i_currentNode; DestinationHolder< Traveller<T> > i_destinationHolder; @@ -66,9 +66,9 @@ class TRINITY_DLL_SPEC WaypointMovementGenerator : public MovementGeneratorMedium< T, WaypointMovementGenerator<T> >, public PathMovementBase<T> { public: - WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) : + WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) : i_nextMoveTime(0), path_id(_path_id), repeating(_repeating), StopedByPlayer(false), node(NULL) {} - + void Initialize(T &); void Finalize(T &); void MovementInform(T &); |