diff options
author | tron <tron@openttd.org> | 2006-03-26 19:20:15 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2006-03-26 19:20:15 +0000 |
commit | cda8934a557f6a7066b48a7eecf46360aa795dee (patch) | |
tree | ab641b54ed908fa761cf34615a8966e70f7e78d1 /water_cmd.c | |
parent | 8f60df1817b9d45f8baa5ab96ab9affb6a7025f0 (diff) | |
download | openttd-cda8934a557f6a7066b48a7eecf46360aa795dee.tar.xz |
(svn r4120) Use the new station functions where appropriate
Diffstat (limited to 'water_cmd.c')
-rw-r--r-- | water_cmd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/water_cmd.c b/water_cmd.c index 952ab3145..78f4e82be 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -3,6 +3,7 @@ #include "stdafx.h" #include "openttd.h" #include "bridge_map.h" +#include "station_map.h" #include "table/sprites.h" #include "table/strings.h" #include "functions.h" @@ -340,17 +341,13 @@ static int32 ClearTile_Water(TileIndex tile, byte flags) // return true if a tile is a water tile. static bool IsWateredTile(TileIndex tile) { - byte m5 = _m[tile].m5; - switch (GetTileType(tile)) { case MP_WATER: // true, if not coast/riverbank - return m5 != 1; + return _m[tile].m5 != 1; case MP_STATION: - // returns true if it is a dock-station - // m5 inside values is m5 < 75 all stations, 83 <= m5 <= 114 new airports - return !(m5 < 75 || (m5 >= 83 && m5 <= 114)); + return IsOilRig(tile) || IsDock(tile) || IsBuoy_(tile); case MP_TUNNELBRIDGE: return IsBridge(tile) && IsBridgeMiddle(tile) && IsWaterUnderBridge(tile); |