petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2195) Add CmdFailed() as the One True Way(tm) to check if a command failed.

Browse Source
This commit is contained in:
tron
2005-04-14 11:17:36 +00:00
parent 3b9931fcba
commit cada1e24b5
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rail_cmd.c
View File

@@ -307,7 +307,7 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags,
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;
if (CmdFailed(ret)) return ret;
cost += ret;
if (flags & DC_EXEC) {
@@ -340,7 +340,7 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags,
}
ret = CheckRailSlope(tileh, rail_bit, m5 & RAIL_BIT_MASK, tile);
if (ret & CMD_ERROR) return ret;
if (CmdFailed(ret)) return ret;
cost += ret;
if (flags & DC_EXEC) _map5[tile] = m5 | rail_bit;
@@ -370,11 +370,11 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags,
default:
ret = CheckRailSlope(tileh, rail_bit, 0, tile);
if (ret & CMD_ERROR) return ret;
if (CmdFailed(ret)) return ret;
cost += ret;
ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
if (ret == CMD_ERROR) return ret;
if (CmdFailed(ret)) return ret;
cost += ret;
if (flags & DC_EXEC) {