mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11659) -Fix [FS#1563]: do not allow modifying non-uniform stations when non-uniform stations are disabled
This commit is contained in:
parent
805ac40280
commit
c26a265f21
|
@ -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;
|
curh = max(TileY(st->train_tile) + curh, TileY(tile) + h) - y;
|
||||||
tile = TileXY(x, y);
|
tile = TileXY(x, y);
|
||||||
} else {
|
} 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 */
|
/* check so the orientation is the same */
|
||||||
if (GetRailStationAxis(st->train_tile) != axis) {
|
if (GetRailStationAxis(st->train_tile) != axis) {
|
||||||
_error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED;
|
_error_message = STR_306D_NONUNIFORM_STATIONS_DISALLOWED;
|
||||||
|
|
Loading…
Reference in New Issue