diff options
| author | frosch <frosch@openttd.org> | 2015-10-30 16:19:09 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2015-10-30 16:19:09 +0000 |
| commit | d626962a3802208a626c3097942e36eb69a4b3cd (patch) | |
| tree | 83acb2a00ac199960daba9f8e2b2df212a2f96cc | |
| parent | 378653100bb3d0b1f3ff7f7ac0fa10b1af085ed8 (diff) | |
| download | openttd-d626962a3802208a626c3097942e36eb69a4b3cd.tar.xz | |
(svn r27420) -Fix [FS#6362]: GrowTownAtRoad sometimes returned false, even when a house was built. (_dp_)
| -rw-r--r-- | src/town_cmd.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index ea44603b0..ee2828ad7 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1378,13 +1378,12 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile) /* Try to grow the town from this point */ GrowTownInTile(&tile, cur_rb, target_dir, t); + if (_grow_town_result == GROWTH_SUCCEED) return true; /* Exclude the source position from the bitmask * 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_SUCCEED; - } + if (cur_rb == ROAD_NONE) return false; if (IsTileType(tile, MP_TUNNELBRIDGE)) { /* Only build in the direction away from the tunnel or bridge. */ @@ -1419,7 +1418,7 @@ static bool GrowTownAtRoad(Town *t, TileIndex tile) /* Max number of times is checked. */ } while (--_grow_town_result >= 0); - return _grow_town_result == GROWTH_SUCCEED - 1; + return false; } /** |