Mercurial > hg > openttd

changeset 9721:475e189b4156 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13845) -Fix (r13838): When adding a WaterClass to oilrig station tiles, also make use of it.
author frosch <frosch@openttd.org>
date Sun, 27 Jul 2008 09:12:18 +0000
parents 7aa78e4bca3d
children be219a19931c
files src/station_cmd.cpp src/water_cmd.cpp
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2193,7 +2193,7 @@
 	if (t == NULL || t->seq == NULL) t = &_station_display_datas[GetStationType(ti->tile)][GetStationGfx(ti->tile)];
 
 
-	if (IsBuoy(ti->tile) || IsDock(ti->tile)) {
+	if (IsBuoy(ti->tile) || IsDock(ti->tile) || IsOilRig(ti->tile)) {
 		if (ti->tileh == SLOPE_FLAT) {
 			DrawWaterClassGround(ti);
 		} else {
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -535,7 +535,10 @@
 			}
 			return false;
 
-		case MP_STATION:  return IsOilRig(tile) || (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile);
+		case MP_STATION:
+			if (IsOilRig(tile)) return GetWaterClass(tile) != WATER_CLASS_INVALID;
+			return (IsDock(tile) && GetTileSlope(tile, NULL) == SLOPE_FLAT) || IsBuoy(tile);
+
 		case MP_INDUSTRY: return IsIndustryTileOnWater(tile);
 		case MP_TUNNELBRIDGE: return GetTunnelBridgeTransportType(tile) == TRANSPORT_WATER && ReverseDiagDir(GetTunnelBridgeDirection(tile)) == DirToDiagDir(from);
 		default:          return false;