(svn r13931) -Codechange [YAPP]: Retain the reservation state when building/removing waypoints or level crossings. (michi_cc)

1 files changed, 6 insertions, 1 deletions

diff --git a/src/waypoint.cpp b/src/waypoint.cpp
index 6dd30cf3c..ad86a6690 100644
--- a/src/waypoint.cpp
+++ b/src/waypoint.cpp
@@ -249,7 +249,9 @@ CommandCost CmdBuildTrainWaypoint(TileIndex tile, uint32 flags, uint32 p1, uint3
 
 		const StationSpec* statspec;
 
+		bool reserved = HasBit(GetTrackReservation(tile), AxisToTrack(axis));
 		MakeRailWaypoint(tile, GetTileOwner(tile), axis, GetRailType(tile), wp->index);
+		SetDepotWaypointReservation(tile, reserved);
 		MarkTileDirtyByTile(tile);
 
 		statspec = GetCustomStationSpec(STAT_CLASS_WAYP, p1);
@@ -319,7 +321,10 @@ CommandCost RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove)
 		RedrawWaypointSign(wp);
 
 		if (justremove) {
-			MakeRailNormal(tile, GetTileOwner(tile), GetRailWaypointBits(tile), GetRailType(tile));
+			TrackBits tracks = GetRailWaypointBits(tile);
+			bool reserved = GetDepotWaypointReservation(tile);
+			MakeRailNormal(tile, GetTileOwner(tile), tracks, GetRailType(tile));
+			if (reserved) SetTrackReservation(tile, tracks);
 			MarkTileDirtyByTile(tile);
 		} else {
 			DoClearSquare(tile);