(svn r16909) -Fix [FS#2996]: NewGRF stations would be triggering assertions all over the place when using the more advanced station types.

-Change: make (rail) waypoints sub classes of 'base stations', make buoys waypoints and unify code between them where possible.

1 files changed, 0 insertions, 22 deletions

diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index f669570ba..756fcd4c3 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -12,23 +12,6 @@
 #include "window_func.h"
 #include "newgrf_station.h"
 #include "order_func.h"
-#include "core/pool_func.hpp"
-
-WaypointPool _waypoint_pool("Waypoint");
-INSTANTIATE_POOL_METHODS(Waypoint)
-
-/**
- * Daily loop for waypoints
- */
-void WaypointsDailyLoop()
-{
-	Waypoint *wp;
-
-	/* Check if we need to delete a waypoint */
-	FOR_ALL_WAYPOINTS(wp) {
-		if (wp->delete_ctr != 0 && --wp->delete_ctr == 0) delete wp;
-	}
-}
 
 /**
  * Draw a waypoint
@@ -67,8 +50,3 @@ Waypoint::~Waypoint()
 
 	this->sign.MarkDirty();
 }
-
-void InitializeWaypoints()
-{
-	_waypoint_pool.CleanPool();
-}