mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15604) -Fix [FS#2661]: towns would only build houses where the grid would not be, even when they aren't allowed to build roads and the user 'implements' another layout.

release/0.7
rubidium 2009-03-03 22:46:08 +00:00
parent b55ed2e668
commit f1a96c5577
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/town_cmd.cpp
View File

@ -1800,6 +1800,9 @@ static bool CheckFree2x2Area(TileIndex tile, TownID town, uint z, bool noslope)
*/ */
static inline bool TownLayoutAllowsHouseHere(Town *t, TileIndex tile) static inline bool TownLayoutAllowsHouseHere(Town *t, TileIndex tile)
{ {
/* Allow towns everywhere when we don't build roads */
if (!_settings_game.economy.allow_town_roads && !_generating_world) return true;
TileIndexDiffC grid_pos = TileIndexToTileIndexDiffC(t->xy, tile); TileIndexDiffC grid_pos = TileIndexToTileIndexDiffC(t->xy, tile);
switch (t->layout) { switch (t->layout) {
@ -1828,6 +1831,9 @@ static inline bool TownLayoutAllowsHouseHere(Town *t, TileIndex tile)
*/ */
static inline bool TownLayoutAllows2x2HouseHere(Town *t, TileIndex tile) static inline bool TownLayoutAllows2x2HouseHere(Town *t, TileIndex tile)
{ {
/* Allow towns everywhere when we don't build roads */
if (!_settings_game.economy.allow_town_roads && !_generating_world) return true;
/* MapSize() is sure dividable by both MapSizeX() and MapSizeY(), /* MapSize() is sure dividable by both MapSizeX() and MapSizeY(),
* so to do only one memory access, use MapSize() */ * so to do only one memory access, use MapSize() */
uint dx = MapSize() + TileX(t->xy) - TileX(tile); uint dx = MapSize() + TileX(t->xy) - TileX(tile);