# HG changeset patch
# User richk
# Date 1205164365 0
# Node ID ca19e616b7bb9bdb0eeff3669233d97f01cceb57
# Parent  7d1ff2f621c7ce966e0529893ca10b0be8c5d203
(svn r12353) [NewGRF_ports] -Fix: Overzealous merging! water_cmd.cpp only needed the extra clause for flood protection, not all the surrounding code.

diff -r 7d1ff2f621c7 -r ca19e616b7bb src/water_cmd.cpp
--- a/src/water_cmd.cpp	Mon Mar 10 15:26:39 2008 +0000
+++ b/src/water_cmd.cpp	Mon Mar 10 15:52:45 2008 +0000
@@ -901,11 +901,7 @@
 			if (IsBuoy(tile) || (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT)) {
 				return (GetWaterClass(tile) == WATER_CLASS_SEA ? FLOOD_ACTIVE : FLOOD_NONE);
 			}
-			return (IsOilRig(tile) ? FLOOD_PASSIVE : FLOOD_NONE);
-			if (IsBuoy(tile) && GetWaterClass(tile) == WATER_CLASS_SEA) return FLOOD_ACTIVE;
-			if (IsOilRig(tile) || IsDock(tile)) return FLOOD_PASSIVE;
-			if (GetStationByTile(tile)->FSMport_flood_protected) return FLOOD_PASSIVE;
-			return FLOOD_NONE;
+			return (IsOilRig(tile || GetStationByTile(tile)->FSMport_flood_protected) ? FLOOD_PASSIVE : FLOOD_NONE);
 
 		case MP_INDUSTRY:
 			return ((GetIndustrySpec(GetIndustryType(tile))->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0 ? FLOOD_PASSIVE : FLOOD_NONE);