1 files changed, 3 insertions, 49 deletions

diff --git a/src/game/base/patrol.h b/src/game/base/patrol.h
index c99c244..c9a309d 100644
--- a/src/game/base/patrol.h
+++ b/src/game/base/patrol.h
@@ -8,10 +8,11 @@
 #define __INCLUDED_BASE_PATROL_H__
 
 #include "core/entity.h"
+
 #include "base/faction.h"
-#include "base/cargo.h"
 #include "base/npc.h"
 #include "base/npctype.h"
+#include "base/waypoint.h"
 
 namespace game
 {
@@ -39,53 +40,6 @@ public:
 	 * */
 	enum Profile { ProfileFreelancer = 0, ProfileConvoy = 1, ProfilePatrol = 2, ProfileGuard = 3, ProfileWingman = 4 };
 	
-	/* --- WayPoint -------------------------------------------- */
-	
-	/**
-	 * @brief a node in the patrol's travel path
-	 * */
-	class WayPoint {
-	public:
-		WayPoint();
-		~WayPoint();
-		
-		inline core::Entity *target()
-		{
-			return waypoint_target;
-		}
-		
-		inline const std::string & target_label() const {
-			return waypoint_target_label;
-		}
-		
-		inline const bool dock() const {
-			return waypoint_dock;
-		}
-		
-		inline const Cargo *cargo() const {
-			return waypoint_cargo;
-		}
-		
-		void set_target(core::Entity *entity);
-		
- 		void set_target_label(const std::string &label);
-		
-		void set_cargo(Cargo *cargo);
-		
-		void set_dock(const bool dock);
-
-	private:
-		std::string	waypoint_target_label;
-		
-		core::Entity	*waypoint_target;
-		
-		Cargo		*waypoint_cargo;
-		
-		bool 		waypoint_dock;
-	};
-		
-	/* --- Patrol ---------------------------------------------- */
-	
 	typedef std::list<WayPoint *> WayPoints;
 	
 	typedef std::list<NPCType *> NPCTypes;
@@ -159,4 +113,4 @@ private:
 
 } // namespace game
 
-#endif // __INCLUDED_BASE_PATROL_H__
\ No newline at end of file
+#endif // __INCLUDED_BASE_PATROL_H__