diff options
| author | frosch <frosch@openttd.org> | 2015-04-25 12:17:16 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2015-04-25 12:17:16 +0000 |
| commit | 9aa0ba43f7275685f128fbc9018ab578aa631e8b (patch) | |
| tree | f06b46808b484b93e1b0c73ed375b35de01448b5 | |
| parent | 9fb56ca02e7e8122f57b73652c1b6734b3b45708 (diff) | |
| download | openttd-9aa0ba43f7275685f128fbc9018ab578aa631e8b.tar.xz | |
(svn r27249) -Fix [FS#6240]: In some cases town growth failure was considered as success. (_dp_)
| -rw-r--r-- | src/town_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 1444337ad..91df84bdb 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1378,7 +1378,7 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile) * and return if no more road blocks available */ if (IsValidDiagDirection(target_dir)) cur_rb &= ~DiagDirToRoadBits(ReverseDiagDir(target_dir)); if (cur_rb == ROAD_NONE) { - return _grow_town_result != GROWTH_SEARCH_STOPPED; + return _grow_town_result == GROWTH_SUCCEED; } if (IsTileType(tile, MP_TUNNELBRIDGE)) { @@ -1402,7 +1402,7 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile) if (IsTileType(tile, MP_ROAD) && !IsRoadDepot(tile) && HasTileRoadType(tile, ROADTYPE_ROAD)) { /* Don't allow building over roads of other cities */ if (IsRoadOwner(tile, ROADTYPE_ROAD, OWNER_TOWN) && Town::GetByTile(tile) != t) { - _grow_town_result = GROWTH_SUCCEED; + return false; } else if (IsRoadOwner(tile, ROADTYPE_ROAD, OWNER_NONE) && _game_mode == GM_EDITOR) { /* If we are in the SE, and this road-piece has no town owner yet, it just found an * owner :) (happy happy happy road now) */ @@ -1436,7 +1436,7 @@ static RoadBits GenRandomRoadBits() /** * Grow the town * @param t town to grow - * @return true iff a house was built + * @return true iff something (house, road, bridge, ...) was built */ static bool GrowTown(Town *t) { |