diff options
author | rubidium <rubidium@openttd.org> | 2007-10-16 19:48:58 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-10-16 19:48:58 +0000 |
commit | ba7c595d846245659c569e0510c3642e88d6992c (patch) | |
tree | 45653866becd6ad493d17cf4b6e65801597a47b5 /src/station_cmd.cpp | |
parent | 4f512a70c360e2aa45e80aacdbcc95d2a754b987 (diff) | |
download | openttd-ba7c595d846245659c569e0510c3642e88d6992c.tar.xz |
(svn r11276) -Codechange: be more consistent with naming of some accessors.
-Fix: make sure canals are never owned by water. Based on a patch by boekabart.
Diffstat (limited to 'src/station_cmd.cpp')
-rw-r--r-- | src/station_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 838e89200..5e83674b4 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1769,7 +1769,7 @@ CommandCost CmdBuildBuoy(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION); - if (!IsClearWaterTile(tile) || tile == 0) return_cmd_error(STR_304B_SITE_UNSUITABLE); + if (!IsWaterTile(tile) || tile == 0) return_cmd_error(STR_304B_SITE_UNSUITABLE); if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST); /* allocate and initialize new station */ @@ -2088,7 +2088,7 @@ static void DrawTile_Station(TileInfo *ti) DrawTramCatenary(ti, axis == AXIS_X ? ROAD_X : ROAD_Y); } - if (IsBuoyTile(ti->tile) && (ti->z != 0 || !IsTileOwner(ti->tile, OWNER_WATER))) DrawCanalWater(ti->tile); + if (IsCanalBuoyTile(ti->tile)) DrawCanalWater(ti->tile); const DrawTileSeqStruct *dtss; foreach_draw_tile_seq(dtss, t->seq) { |