gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20791) -Fix (r12161): Building 2x2 houses did not work for 2x2 road layouts on all map sizes.

Browse Source
This commit is contained in:
frosch 2010-09-12 19:40:47 +00:00
parent b249046364
commit f0783d7e72
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/town_cmd.cpp
View File

@ -1984,18 +1984,19 @@ static inline bool TownLayoutAllows2x2HouseHere(Town *t, TileIndex tile)
/* Allow towns everywhere when we don't build roads */ /* Allow towns everywhere when we don't build roads */
if (!_settings_game.economy.allow_town_roads && !_generating_world) return true; if (!_settings_game.economy.allow_town_roads && !_generating_world) return true;
/* MapSize() is sure dividable by both MapSizeX() and MapSizeY(), /* Compute relative position of tile. (Positive offsets are towards north) */
* so to do only one memory access, use MapSize() */ TileIndexDiffC grid_pos = TileIndexToTileIndexDiffC(t->xy, tile);
uint dx = MapSize() + TileX(t->xy) - TileX(tile);
uint dy = MapSize() + TileY(t->xy) - TileY(tile);
switch (t->layout) { switch (t->layout) {
case TL_2X2_GRID: case TL_2X2_GRID:
if ((dx % 3) != 0 || (dy % 3) != 0) return false; grid_pos.x %= 3;
grid_pos.y %= 3;
if ((grid_pos.x != 2 && grid_pos.x != -1) ||
(grid_pos.y != 2 && grid_pos.y != -1)) return false;
break; break;
case TL_3X3_GRID: case TL_3X3_GRID:
if ((dx % 4) < 2 || (dy % 4) < 2) return false; if ((grid_pos.x & 3) < 2 || (grid_pos.y & 3) < 2) return false;
break; break;
default: default: