cpp/openttd-patchpack/source Changeset - r20158:08af60e3da50

Changeset - r20158:08af60e3da50

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 11 years ago 2013-03-31 20:07:32
rubidium@openttd.org

(svn r25132) -Fix [FS#5510, FS#5516]: station rebuilding could leave reserved tiles which caused crashes later on

1 file changed with 10 insertions and 2 deletions:

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -1319,8 +1319,16 @@ CommandCost CmdBuildRailStation(TileInde @@
 		TILE_AREA_LOOP(tile, update_reservation_area) {
 			DiagDirection dir = AxisToDiagDir(axis);
 			TileIndexDiff tile_offset = TileOffsByDiagDir(dir);
 			TileIndex platform_begin = tile - tile_offset * (st->GetPlatformLength(tile, ReverseDiagDir(dir)) - 1);
 			TileIndex platform_end   = tile + tile_offset * (st->GetPlatformLength(tile, dir) - 1);
 			TileIndex platform_begin = tile;
 			TileIndex platform_end = tile;
 			/* We can only account for tiles that are reachable from this tile, so ignore primarily blocked tiles while finding the platform begin and end. */
 			for (TileIndex next_tile = platform_begin - tile_offset; IsCompatibleTrainStationTile(next_tile, platform_begin); next_tile -= tile_offset) {
 				platform_begin = next_tile;
+			}
 			for (TileIndex next_tile = platform_end + tile_offset; IsCompatibleTrainStationTile(next_tile, platform_end); next_tile += tile_offset) {
 				platform_end = next_tile;
+			}
 			/* If there is at least on reservation on the platform, we reserve the whole platform. */
 			bool reservation = false;

0 comments (0 inline, 0 general)