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

(svn r3228) - Fix: [ 1327011 ] Fix: don't lower land on tunnel, even with diag tracks on it (based on patch by glx)

Browse Source
This commit is contained in:
peter1138
2005-11-22 22:30:35 +00:00
parent 898bb915ac
commit 48855806d6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
clear_cmd.c
View File

@@ -86,7 +86,7 @@ static void TerraformAddDirtyTileAround(TerraformerState *ts, TileIndex tile)
static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode) static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode)
{ {
int r; int r;
int32 ret; bool skip_clear = false;
assert(tile < MapSize()); assert(tile < MapSize());
@@ -111,18 +111,20 @@ static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode)
// If we have a single diagonal track there, the other side of // If we have a single diagonal track there, the other side of
// tile can be terraformed. // tile can be terraformed.
if ((_m[tile].m5 & ~0x40) == _railway_modes[mode]) return 0; if ((_m[tile].m5 & ~0x40) == _railway_modes[mode]) skip_clear = true;
} }
ret = DoCommandByTile(tile, 0,0, ts->flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR); if (!skip_clear) {
int32 ret = DoCommandByTile(tile, 0,0, ts->flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
if (ret == CMD_ERROR) { if (CmdFailed(ret)) {
_terraform_err_tile = tile; _terraform_err_tile = tile;
return -1; return -1;
}
ts->cost += ret;
} }
ts->cost += ret;
if (ts->tile_table_count >= 625) return -1; if (ts->tile_table_count >= 625) return -1;
ts->tile_table[ts->tile_table_count++] = tile; ts->tile_table[ts->tile_table_count++] = tile;