(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.

src/saveload/saveload_internal.h

@@ -16,7 +16,10 @@ StringID RemapOldStringID(StringID s);
 char *CopyFromOldName(StringID id);
 void ResetOldNames();
 
-void AfterLoadWaypoints();
+void MoveBuoysToWaypoints();
+void MoveWaypointsToBaseStations();
+const SaveLoad *GetBaseStationDescription();
+
 void AfterLoadVehicles(bool part_of_load);
 void AfterLoadStations();
 void AfterLoadLabelMaps();