Mercurial > hg > openttd
changeset 8098:2f4ef2db2161 draft
(svn r11659) -Fix [FS#1563]: do not allow modifying non-uniform stations when non-uniform stations are disabled
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Tue, 18 Dec 2007 18:02:00 +0000 |
| parents | 6a3202b46c32 |
| children | 2ed2e5ba55ef |
| files | src/station_cmd.cpp |
| diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -794,6 +794,15 @@ 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;