From 31765f0dfea216ab4d49f2ca9865b789e057b91a Mon Sep 17 00:00:00 2001 From: smatz Date: Tue, 18 Dec 2007 18:02:00 +0000 Subject: [PATCH] (svn r11659) -Fix [FS#1563]: do not allow modifying non-uniform stations when non-uniform stations are disabled --- src/station_cmd.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index dc077e27f6..d8555037f7 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -794,6 +794,15 @@ static bool CanExpandRailroadStation(const Station* st, uint* fin, Axis axis) curh = max(TileY(st->train_tile) + curh, TileY(tile) + h) - y; tile = TileXY(x, y); } else { + /* do not allow modifying non-uniform stations, + * the uniform-stations code wouldn't handle it well */ + BEGIN_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile) + if (!st->TileBelongsToRailStation(t)) { // there may be adjoined station + _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED; + return false; + } + END_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile) + /* check so the orientation is the same */ if (GetRailStationAxis(st->train_tile) != axis) { _error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED;