dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15685) -Fix [FS#2720]: do not crash when someone substitutes the "map generation" sprites with garbage.

Browse Source
This commit is contained in:
rubidium
2009-03-12 14:21:18 +00:00
parent 21daa3fbc9
commit 6ace408bfe
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/landscape.cpp
View File

@@ -766,7 +766,7 @@ static void GenerateTerrain(int type, uint flag)
Tile *tile_cur = tile;
for (uint w_cur = w; w_cur != 0; --w_cur) {
if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4);
p++;
tile_cur++;
}
@@ -779,7 +779,7 @@ static void GenerateTerrain(int type, uint flag)
Tile *tile_cur = tile;
for (uint h_cur = h; h_cur != 0; --h_cur) {
if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4);
p++;
tile_cur += TileDiffXY(0, 1);
}
@@ -793,7 +793,7 @@ static void GenerateTerrain(int type, uint flag)
Tile *tile_cur = tile;
for (uint w_cur = w; w_cur != 0; --w_cur) {
if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4);
p++;
tile_cur--;
}
@@ -807,7 +807,7 @@ static void GenerateTerrain(int type, uint flag)
Tile *tile_cur = tile;
for (uint h_cur = h; h_cur != 0; --h_cur) {
if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
if (GB(*p, 0, 4) >= tile_cur->type_height) tile_cur->type_height = GB(*p, 0, 4);
p++;
tile_cur -= TileDiffXY(0, 1);
}
@@ -815,6 +815,8 @@ static void GenerateTerrain(int type, uint flag)
} while (--w != 0);
break;
}
FixSlopes();
}