diff options
author | Gabda <gabda87@gmail.com> | 2019-02-09 00:05:25 +0100 |
---|---|---|
committer | Charles Pigott <charlespigott@googlemail.com> | 2019-02-08 23:05:25 +0000 |
commit | 37bb2c930828260cd28365c8d96befea096bacd6 (patch) | |
tree | 0fe5efa02b36db2a08440c264a1d1a9a0494115f /src/landscape.cpp | |
parent | 5e4f76f2f9ad105f619003657229b3bbd87ba678 (diff) | |
download | openttd-37bb2c930828260cd28365c8d96befea096bacd6.tar.xz |
Codechange: Make the style of MakeVoid calls uniform (#7192)
Diffstat (limited to 'src/landscape.cpp')
-rw-r--r-- | src/landscape.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/landscape.cpp b/src/landscape.cpp index 2f14a69e4..b173709f3 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -841,22 +841,17 @@ void RunTileLoop() void InitializeLandscape() { - uint maxx = MapMaxX(); - uint maxy = MapMaxY(); - uint sizex = MapSizeX(); - - uint y; - for (y = _settings_game.construction.freeform_edges ? 1 : 0; y < maxy; y++) { - uint x; - for (x = _settings_game.construction.freeform_edges ? 1 : 0; x < maxx; x++) { - MakeClear(sizex * y + x, CLEAR_GRASS, 3); - SetTileHeight(sizex * y + x, 0); - SetTropicZone(sizex * y + x, TROPICZONE_NORMAL); - ClearBridgeMiddle(sizex * y + x); + for (uint y = _settings_game.construction.freeform_edges ? 1 : 0; y < MapMaxY(); y++) { + for (uint x = _settings_game.construction.freeform_edges ? 1 : 0; x < MapMaxX(); x++) { + MakeClear(TileXY(x, y), CLEAR_GRASS, 3); + SetTileHeight(TileXY(x, y), 0); + SetTropicZone(TileXY(x, y), TROPICZONE_NORMAL); + ClearBridgeMiddle(TileXY(x, y)); } - MakeVoid(sizex * y + x); } - for (uint x = 0; x < sizex; x++) MakeVoid(sizex * y + x); + + for (uint x = 0; x < MapSizeX(); x++) MakeVoid(TileXY(x, MapMaxY())); + for (uint y = 0; y < MapSizeY(); y++) MakeVoid(TileXY(MapMaxX(), y)); } static const byte _genterrain_tbl_1[5] = { 10, 22, 33, 37, 4 }; |