diff options
3 files changed, 41 insertions, 15 deletions
diff --git a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h index 9c8db49a98f..a7ba4c3ca7a 100644 --- a/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FlightPathMovementGenerator.h @@ -18,9 +18,11 @@ #ifndef FlightPathMovementGenerator_h__ #define FlightPathMovementGenerator_h__ -#include "WaypointMovementGenerator.h" +#include "MovementGenerator.h" +#include "PathMovementBase.h" class Player; +struct TaxiPathNodeEntry; /** * FlightPathMovementGenerator generates movement of the player for the paths diff --git a/src/server/game/Movement/MovementGenerators/PathMovementBase.h b/src/server/game/Movement/MovementGenerators/PathMovementBase.h new file mode 100644 index 00000000000..5b9be57ff7f --- /dev/null +++ b/src/server/game/Movement/MovementGenerators/PathMovementBase.h @@ -0,0 +1,37 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef PathMovementBase_h__ +#define PathMovementBase_h__ + +#include "Define.h" + +template<class Entity, class BasePath> +class PathMovementBase +{ +public: + PathMovementBase() : _path(), _currentNode(0) { } + virtual ~PathMovementBase() { }; + + uint32 GetCurrentNode() const { return _currentNode; } + +protected: + BasePath _path; + uint32 _currentNode; +}; + +#endif // PathMovementBase_h__ diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index d3f3cd664e3..33989bf89de 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -26,26 +26,13 @@ */ #include "MovementGenerator.h" +#include "PathMovementBase.h" #include "Timer.h" class Creature; struct TaxiPathNodeEntry; struct WaypointPath; -template<class Entity, class BasePath> -class PathMovementBase -{ - public: - PathMovementBase() : _path(), _currentNode(0) { } - virtual ~PathMovementBase() { }; - - uint32 GetCurrentNode() const { return _currentNode; } - - protected: - BasePath _path; - uint32 _currentNode; -}; - template<class T> class WaypointMovementGenerator; |