cpp/openttd-patchpack/source File Diff

File diff r15932:94aeec77b25a → r15933:39e6324db57a

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -497,7 +497,7 @@ static bool IsWateredTile(TileIndex tile @@
 			if ((IsTileType(src_tile, MP_STATION) && IsOilRig(src_tile)) ||
 			    (IsTileType(src_tile, MP_INDUSTRY) && GetIndustryIndex(src_tile) == GetIndustryIndex(tile))) return true;
-			return IsIndustryTileOnWater(tile);
+			return IsTileOnWater(tile);
+		}
 		case MP_TUNNELBRIDGE: return GetTunnelBridgeTransportType(tile) == TRANSPORT_WATER && ReverseDiagDir(GetTunnelBridgeDirection(tile)) == DirToDiagDir(from);
@@ @@ -932,9 +932,11 @@ FloodingBehaviour GetFloodingBehaviour(T @@
 			if (IsCoast(tile)) {
 				Slope tileh = GetTileSlope(tile, NULL);
 				return (IsSlopeWithOneCornerRaised(tileh) ? FLOOD_ACTIVE : FLOOD_DRYUP);
 			} else {
 				return (GetWaterClass(tile) == WATER_CLASS_SEA) ? FLOOD_ACTIVE : FLOOD_NONE;
+			}
 			/* FALL THROUGH */
 		case MP_STATION:
 		case MP_INDUSTRY:
 			return (GetWaterClass(tile) == WATER_CLASS_SEA) ? FLOOD_ACTIVE : FLOOD_NONE;
 		case MP_RAILWAY:
 			if (GetRailGroundType(tile) == RAIL_GROUND_WATER) {
@@ @@ -945,15 +947,6 @@ FloodingBehaviour GetFloodingBehaviour(T @@
 		case MP_TREES:
 			return (GetTreeGround(tile) == TREE_GROUND_SHORE ? FLOOD_DRYUP : FLOOD_NONE);
 		case MP_STATION:
 			if (IsBuoy(tile) || (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsOilRig(tile)) {
 				return (GetWaterClass(tile) == WATER_CLASS_SEA ? FLOOD_ACTIVE : FLOOD_NONE);
+			}
 			return FLOOD_NONE;
 		case MP_INDUSTRY:
 			return ((IsIndustryTileOnWater(tile) && GetWaterClass(tile) == WATER_CLASS_SEA) ? FLOOD_ACTIVE : FLOOD_NONE);
 		default:
 			return FLOOD_NONE;
+	}