From ba7c595d846245659c569e0510c3642e88d6992c Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 16 Oct 2007 19:48:58 +0000 Subject: (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. --- src/town_cmd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/town_cmd.cpp') diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 7771e541b..aaeb518cb 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -933,7 +933,7 @@ static bool GrowTownWithBridge(const Town *t, TileIndex tile, RoadBits rcmd) return false; } bridge_tile = TILE_MASK(bridge_tile + TileOffsByDiagDir(bridge_dir)); - } while (IsClearWaterTile(bridge_tile)); + } while (IsWaterTile(bridge_tile)); /* no water tiles in between? */ if (bridge_length == 1) return false; @@ -1072,7 +1072,7 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t TileIndex house_tile = TileAddByDiagDir(tile, target_dir); // position of a possible house /* Don't walk into water. */ - if (IsClearWaterTile(house_tile)) return; + if (IsWaterTile(house_tile)) return; switch (_patches.town_layout) { default: NOT_REACHED(); @@ -1121,7 +1121,7 @@ static void GrowTownInTile(TileIndex *tile_ptr, RoadBits cur_rb, DiagDirection t } /* Return if a water tile */ - if (IsClearWaterTile(tile)) return; + if (IsWaterTile(tile)) return; /* Make the roads look nicer */ rcmd = CleanUpRoadBits(tile, rcmd); -- cgit v1.2.3-54-g00ecf