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

(svn r2201) - Fix: Crash in scenario-editor with terraforming out-of-map bounds.

release/0.4.5
Darkvater 2005-04-14 22:59:49 +00:00
parent 2e58ce2fd9
commit 174030a15f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main_gui.c
View File

@ -1152,7 +1152,7 @@ static void AskResetLandscape(uint mode)
*/ */
static void CommonRaiseLowerBigLand(uint tile, int mode) static void CommonRaiseLowerBigLand(uint tile, int mode)
{ {
int size; int sizex, sizey;
byte h; byte h;
_error_message_2 = mode ? STR_0808_CAN_T_RAISE_LAND_HERE : STR_0809_CAN_T_LOWER_LAND_HERE; _error_message_2 = mode ? STR_0808_CAN_T_RAISE_LAND_HERE : STR_0809_CAN_T_LOWER_LAND_HERE;
@ -1164,27 +1164,32 @@ static void CommonRaiseLowerBigLand(uint tile, int mode)
} else { } else {
SndPlayTileFx(SND_1F_SPLAT, tile); SndPlayTileFx(SND_1F_SPLAT, tile);
size = _terraform_size; assert(_terraform_size != 0);
assert(size != 0); // check out for map overflows
sizex = min(MapSizeX() - TileX(tile) - 1, _terraform_size);
sizey = min(MapSizeY() - TileY(tile) - 1, _terraform_size);
if (sizex == 0 || sizey == 0) return;
if (mode != 0) { if (mode != 0) {
/* Raise land */ /* Raise land */
h = 15; // XXX - max height h = 15; // XXX - max height
BEGIN_TILE_LOOP(tile2, size, size, tile) BEGIN_TILE_LOOP(tile2, sizex, sizey, tile) {
h = min(h, TileHeight(tile2)); h = min(h, TileHeight(tile2));
END_TILE_LOOP(tile2, size, size, tile) } END_TILE_LOOP(tile2, sizex, sizey, tile)
} else { } else {
/* Lower land */ /* Lower land */
h = 0; h = 0;
BEGIN_TILE_LOOP(tile2, size, size, tile) BEGIN_TILE_LOOP(tile2, sizex, sizey, tile) {
h = max(h, TileHeight(tile2)); h = max(h, TileHeight(tile2));
END_TILE_LOOP(tile2, size, size, tile) } END_TILE_LOOP(tile2, sizex, sizey, tile)
} }
BEGIN_TILE_LOOP(tile2, size, size, tile) BEGIN_TILE_LOOP(tile2, sizex, sizey, tile) {
if (TileHeight(tile2) == h) { if (TileHeight(tile2) == h) {
DoCommandP(tile2, 8, (uint32)mode, NULL, CMD_TERRAFORM_LAND | CMD_AUTO); DoCommandP(tile2, 8, (uint32)mode, NULL, CMD_TERRAFORM_LAND | CMD_AUTO);
} }
END_TILE_LOOP(tile2, size, size, tile) } END_TILE_LOOP(tile2, sizex, sizey, tile)
} }
_generating_world = false; _generating_world = false;