Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r5288) - Fix [FS#199]: Tunnel construction could erronously terraform a foundationed tile with rails. This also fixes another bug where you could implicitly remove a foundation by raising nearby sloped land. Desirable perhaps, but unwanted.

Browse Source
This commit is contained in:
Darkvater 2006-06-16 18:54:48 +00:00
parent 81f5ab9ba6
commit e835bba5b1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clear_cmd.c
View File

@ -241,7 +241,8 @@ int32 CmdTerraformLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
TileIndex *ti = ts.tile_table; TileIndex *ti = ts.tile_table;
for (count = ts.tile_table_count; count != 0; count--, ti++) { for (count = ts.tile_table_count; count != 0; count--, ti++) {
uint a, b, c, d, r, min; uint a, b, c, d, min;
Slope s;
TileIndex tile = *ti; TileIndex tile = *ti;
_terraform_err_tile = tile; _terraform_err_tile = tile;
@ -251,14 +252,19 @@ int32 CmdTerraformLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
c = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 1)); c = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 1));
d = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 1)); d = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 1));
r = GetTileh(a, b, c, d, &min); s = GetTileh(a, b, c, d, &min);
if (IsTileType(tile, MP_RAILWAY)) { if (IsTileType(tile, MP_RAILWAY)) {
if (IsSteepSlope(r)) return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK); if (IsSteepSlope(s)) return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
if (IsPlainRailTile(tile)) { if (IsPlainRailTile(tile)) {
/* We need to check if a rail is on a leveled foundation and
* then treat it as such. Important for correct tunneling */
extern const TrackBits _valid_tileh_slopes[2][15]; extern const TrackBits _valid_tileh_slopes[2][15];
if (GetTrackBits(tile) & ~_valid_tileh_slopes[0][r]) return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK); TrackBits tb = GetTrackBits(tile);
uint foundation = (GetRailFoundation(s, tb) == 0) ? 1 : 0;
if (tb & ~_valid_tileh_slopes[foundation][s]) return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
} else return_cmd_error(STR_5800_OBJECT_IN_THE_WAY); } else return_cmd_error(STR_5800_OBJECT_IN_THE_WAY);
} }