mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r2134) Return the correct error message if rail is already under a bridge, fix for r2131

This commit is contained in:
tron 2005-04-02 22:04:43 +00:00
parent edd301d364
commit 0f830b79e1
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rail_cmd.c
View File

@ -299,21 +299,31 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags,
switch (GetTileType(tile)) {
case MP_TUNNELBRIDGE:
if ((m5 & 0xC0) != 0xC0 || // not bridge middle part?
(m5 & 0x01 ? 1 : 2) != rail_bit || // wrong direction?
(m5 & 0x38) != 0x00) { // no clear land underneath?
(m5 & 0x01 ? 1 : 2) != rail_bit) { // wrong direction?
// Get detailed error message
return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
}
ret = CheckRailSlope(tileh, rail_bit, 0, tile);
if (ret & CMD_ERROR) return ret;
cost += ret;
switch (m5 & 0x38) { // what's under the bridge?
case 0x00: // clear land
ret = CheckRailSlope(tileh, rail_bit, 0, tile);
if (ret & CMD_ERROR) return ret;
cost += ret;
if (flags & DC_EXEC) {
_map_owner[tile] = _current_player;
_map3_lo[tile] &= ~0x0F;
_map3_lo[tile] |= rail_type;
_map5[tile] = (m5 & 0xC7) | 0x20; // railroad under bridge
if (flags & DC_EXEC) {
_map_owner[tile] = _current_player;
_map3_lo[tile] &= ~0x0F;
_map3_lo[tile] |= rail_type;
_map5[tile] = (m5 & 0xC7) | 0x20; // railroad under bridge
}
break;
case 0x20: // rail already there
return_cmd_error(STR_1007_ALREADY_BUILT);
default:
// Get detailed error message
return DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
}
break;