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

(svn r23090) -Codechange: use map accessors instead of directly accessing the map (mhl)

release/1.2
rubidium 2011-11-04 06:05:11 +00:00
parent 3f853e7a56
commit 47203dbeb5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/landscape.cpp
View File

@ -813,16 +813,16 @@ static void GenerateTerrain(int type, uint flag)
if (x + w >= MapMaxX() - 1) return; if (x + w >= MapMaxX() - 1) return;
if (y + h >= MapMaxY() - 1) return; if (y + h >= MapMaxY() - 1) return;
Tile *tile = &_m[TileXY(x, y)]; TileIndex tile = TileXY(x, y);
switch (direction) { switch (direction) {
default: NOT_REACHED(); default: NOT_REACHED();
case DIAGDIR_NE: case DIAGDIR_NE:
do { do {
Tile *tile_cur = tile; TileIndex tile_cur = tile;
for (uint w_cur = w; w_cur != 0; --w_cur) { for (uint w_cur = w; w_cur != 0; --w_cur) {
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4); if (GB(*p, 0, 4) >= TileHeight(tile_cur)) SetTileHeight(tile_cur, GB(*p, 0, 4));
p++; p++;
tile_cur++; tile_cur++;
} }
@ -832,10 +832,10 @@ static void GenerateTerrain(int type, uint flag)
case DIAGDIR_SE: case DIAGDIR_SE:
do { do {
Tile *tile_cur = tile; TileIndex tile_cur = tile;
for (uint h_cur = h; h_cur != 0; --h_cur) { for (uint h_cur = h; h_cur != 0; --h_cur) {
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4); if (GB(*p, 0, 4) >= TileHeight(tile_cur)) SetTileHeight(tile_cur, GB(*p, 0, 4));
p++; p++;
tile_cur += TileDiffXY(0, 1); tile_cur += TileDiffXY(0, 1);
} }
@ -846,10 +846,10 @@ static void GenerateTerrain(int type, uint flag)
case DIAGDIR_SW: case DIAGDIR_SW:
tile += TileDiffXY(w - 1, 0); tile += TileDiffXY(w - 1, 0);
do { do {
Tile *tile_cur = tile; TileIndex tile_cur = tile;
for (uint w_cur = w; w_cur != 0; --w_cur) { for (uint w_cur = w; w_cur != 0; --w_cur) {
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4); if (GB(*p, 0, 4) >= TileHeight(tile_cur)) SetTileHeight(tile_cur, GB(*p, 0, 4));
p++; p++;
tile_cur--; tile_cur--;
} }
@ -860,10 +860,10 @@ static void GenerateTerrain(int type, uint flag)
case DIAGDIR_NW: case DIAGDIR_NW:
tile += TileDiffXY(0, h - 1); tile += TileDiffXY(0, h - 1);
do { do {
Tile *tile_cur = tile; TileIndex tile_cur = tile;
for (uint h_cur = h; h_cur != 0; --h_cur) { for (uint h_cur = h; h_cur != 0; --h_cur) {
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4); if (GB(*p, 0, 4) >= TileHeight(tile_cur)) SetTileHeight(tile_cur, GB(*p, 0, 4));
p++; p++;
tile_cur -= TileDiffXY(0, 1); tile_cur -= TileDiffXY(0, 1);
} }