From fcfd0f1c76b6a9e7c11eb8ca2adb5389462de7a2 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 5 Dec 2007 00:16:20 +0000 Subject: (svn r11574) -Fix: flood train stations when there are no trains on border tiles too (when non-uniform stations are OFF) --- src/water_cmd.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 664e3f5d8..76b4ee4d2 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -664,6 +664,20 @@ static Vehicle *FindFloodableVehicleOnTile(TileIndex tile) return NULL; } + /* if non-uniform stations are disabled, flood some train in this train station (if there is any) */ + if (!_patches.nonuniform_stations && IsTileType(tile, MP_STATION) && GetStationType(tile) == STATION_RAIL) { + const Station *st = GetStationByTile(tile); + + BEGIN_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile) + if (st->TileBelongsToRailStation(t)) { + Vehicle *v = FindVehicleOnTileZ(t, 0); + if (v != NULL && (v->vehstatus & VS_CRASHED) == 0) return v; + } + END_TILE_LOOP(t, st->trainst_w, st->trainst_h, st->train_tile) + + return NULL; + } + if (!IsBridgeTile(tile)) return FindVehicleOnTileZ(tile, 0); TileIndex end = GetOtherBridgeEnd(tile); -- cgit v1.2.3-70-g09d2