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

(svn r5312) - Fix (r5288): Be very strict about terraforming. If a rail tile has a foundation already, bail out.

Browse Source
This commit is contained in:
Darkvater 2006-06-19 06:49:51 +00:00
parent 6102f6e2f9
commit befc6accba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clear_cmd.c
View File

@ -259,13 +259,14 @@ int32 CmdTerraformLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (IsSteepSlope(s)) 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 /* If a piece of rail is on a foundation, prohibit any terraforming
* then treat it as such. Important for correct tunneling */ * of that tile. We do need to check this with the original slope, not
* the would-be one. */
extern const TrackBits _valid_tileh_slopes[2][15]; extern const TrackBits _valid_tileh_slopes[2][15];
TrackBits tb = GetTrackBits(tile); 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); if (GetRailFoundation(GetTileSlope(tile, NULL), tb) != 0) return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
if (tb & ~_valid_tileh_slopes[0][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);
} }