diff options
| author | tron <tron@openttd.org> | 2006-03-12 12:19:25 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-03-12 12:19:25 +0000 |
| commit | b394f72fa9305094ddf672564a0f4a0c8f16e89b (patch) | |
| tree | a2aa298975f3b0ba6fb0889afdfb76c415951aa7 /tunnelbridge_cmd.c | |
| parent | 214b5eb42f8296965837a29e086fd4c6a7406c37 (diff) | |
| download | openttd-b394f72fa9305094ddf672564a0f4a0c8f16e89b.tar.xz | |
(svn r3829) Reduce the use of _error_message by directly returning error codes instead of using this global variable
Diffstat (limited to 'tunnelbridge_cmd.c')
| -rw-r--r-- | tunnelbridge_cmd.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index 84a1ec4a1..f43728695 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -282,8 +282,8 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2) /* Try and clear the start landscape */ - if (CmdFailed(ret = DoCommandByTile(ti_start.tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR))) - return CMD_ERROR; + ret = DoCommandByTile(ti_start.tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); + if (CmdFailed(ret)) return ret; cost = ret; // true - bridge-start-tile, false - bridge-end-tile @@ -295,7 +295,7 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2) /* Try and clear the end landscape */ ret = DoCommandByTile(ti_end.tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - if (CmdFailed(ret)) return CMD_ERROR; + if (CmdFailed(ret)) return ret; cost += ret; // false - end tile slope check @@ -336,15 +336,13 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2) tile += delta; - _error_message = STR_5009_LEVEL_LAND_OR_WATER_REQUIRED; - if (GetTileSlope(tile, &z) != 0 && z >= ti_start.z) return CMD_ERROR; + if (GetTileSlope(tile, &z) != 0 && z >= ti_start.z) { + return_cmd_error(STR_5009_LEVEL_LAND_OR_WATER_REQUIRED); + } switch (GetTileType(tile)) { case MP_WATER: - if (!EnsureNoVehicle(tile)) { - _error_message = STR_980E_SHIP_IN_THE_WAY; - return CMD_ERROR; - } + if (!EnsureNoVehicle(tile)) return_cmd_error(STR_980E_SHIP_IN_THE_WAY); if (_m[tile].m5 > 1) goto not_valid_below; m5 = 0xC8; break; @@ -368,7 +366,7 @@ int32 CmdBuildBridge(int x, int y, uint32 flags, uint32 p1, uint32 p2) not_valid_below:; /* try and clear the middle landscape */ ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - if (CmdFailed(ret)) return CMD_ERROR; + if (CmdFailed(ret)) return ret; cost += ret; m5 = 0xC0; break; |