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

(svn r5365) -Fix: It was possible to dig into a tunnel if certain rail combinations were ontop of it 

(Hopefully this time it works for real)
release/0.5
tron 2006-06-25 18:58:45 +00:00
parent 06cbf50971
commit 09ec480c56
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clear_cmd.c
View File

@ -101,10 +101,13 @@ static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode)
static const TrackBits safe_track[] = { TRACK_BIT_LOWER, TRACK_BIT_LEFT, TRACK_BIT_UPPER, TRACK_BIT_RIGHT }; static const TrackBits safe_track[] = { TRACK_BIT_LOWER, TRACK_BIT_LEFT, TRACK_BIT_UPPER, TRACK_BIT_RIGHT };
static const Slope unsafe_slope[] = { SLOPE_S, SLOPE_W, SLOPE_N, SLOPE_E }; static const Slope unsafe_slope[] = { SLOPE_S, SLOPE_W, SLOPE_N, SLOPE_E };
Slope tileh;
uint z;
// Nothing could be built at the steep slope - this avoids a bug // Nothing could be built at the steep slope - this avoids a bug
// when you have a single diagonal track in one corner on a // when you have a single diagonal track in one corner on a
// basement and then you raise/lower the other corner. // basement and then you raise/lower the other corner.
Slope tileh = GetTileSlope(tile, NULL); tileh = GetTileSlope(tile, &z);
if (tileh == unsafe_slope[mode] || if (tileh == unsafe_slope[mode] ||
tileh == ComplementSlope(unsafe_slope[mode])) { tileh == ComplementSlope(unsafe_slope[mode])) {
_terraform_err_tile = tile; _terraform_err_tile = tile;
@ -115,6 +118,18 @@ 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 (IsPlainRailTile(tile) && GetTrackBits(tile) == safe_track[mode]) { if (IsPlainRailTile(tile) && GetTrackBits(tile) == safe_track[mode]) {
/* If terraforming downwards prevent damaging a potential tunnel below.
* This check is only necessary for flat tiles, because if the tile is
* non-flat, then the corner opposing the rail is raised. Only this corner
* can be lowered and this is a safe action
*/
if (tileh == SLOPE_FLAT &&
ts->direction == -1 &&
IsTunnelInWay(tile, z - TILE_HEIGHT)) {
_terraform_err_tile = tile;
_error_message = STR_1002_EXCAVATION_WOULD_DAMAGE;
return -1;
}
return 0; return 0;
} }
} }