(svn r3472) - [PBS] Remove from trunk. Anyone interested can still find it in branch/pbs. This reverts revisions r3158, r3140, r3075, r2977, r2674, r2625, r2621, r2529, r2528, r2525, r2524, r2519, r2517, r2516, r2507, r2499. (in conjunction with Tron)

- The only change is that the nsignalsw.grf file is kept and that existing nightlies with PBS signals get those signals converted to combo-signals.

1 files changed, 0 insertions, 14 deletions

diff --git a/waypoint.c b/waypoint.c
index ee9e04ada..36af86cf4 100644
--- a/waypoint.c
+++ b/waypoint.c
@@ -14,7 +14,6 @@
 #include "town.h"
 #include "waypoint.h"
 #include "variables.h"
-#include "pbs.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 
@@ -209,7 +208,6 @@ int32 CmdBuildTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 
 	if (flags & DC_EXEC) {
 		const StationSpec *spec = NULL;
-		bool reserved = PBSTileReserved(tile) != 0;
 		ModifyTile(tile, MP_MAP2 | MP_MAP5, wp->index, RAIL_TYPE_WAYPOINT | dir);
 
 		if (GB(p1, 0, 8) < GetNumCustomStations(STAT_CLASS_WAYP))
@@ -228,12 +226,6 @@ int32 CmdBuildTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 			wp->localidx = 0;
 		}
 
-		if (reserved) {
-			PBSReserveTrack(tile, dir);
-		} else {
-			PBSClearTrack(tile, dir);
-		}
-
 		wp->deleted = 0;
 		wp->xy = tile;
 		wp->build_date = _date;
@@ -302,15 +294,9 @@ int32 RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove)
 		RedrawWaypointSign(wp);
 
 		if (justremove) {
-			bool reserved = PBSTileReserved(tile) != 0;
 			ModifyTile(tile, MP_MAP2_CLEAR | MP_MAP5, 1<<direction);
 			CLRBIT(_m[tile].m3, 4);
 			_m[tile].m4 = 0;
-			if (reserved) {
-				PBSReserveTrack(tile, direction);
-			} else {
-				PBSClearTrack(tile, direction);
-			}
 		} else {
 			DoClearSquare(tile);
 			SetSignalsOnBothDir(tile, direction);