diff options
| author | alberth <alberth@openttd.org> | 2010-03-14 12:58:51 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-03-14 12:58:51 +0000 |
| commit | 3b367ab708fa6115887752869d66b902c529b9fc (patch) | |
| tree | f49477d3efbd413059bd0a0b8d906414d9bb8b60 /src/water_cmd.cpp | |
| parent | 777123c228e163c976303be0588093732816f8ca (diff) | |
| download | openttd-3b367ab708fa6115887752869d66b902c529b9fc.tar.xz | |
(svn r19415) -Codechange: Forward CommandCost with an error back to the caller.
Diffstat (limited to 'src/water_cmd.cpp')
| -rw-r--r-- | src/water_cmd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index a37d296d2..2882ac80e 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -126,9 +126,9 @@ CommandCost CmdBuildShipDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, ui WaterClass wc1 = GetWaterClass(tile); WaterClass wc2 = GetWaterClass(tile2); ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - if (ret.Failed()) return CMD_ERROR; + if (ret.Failed()) return ret; ret = DoCommand(tile2, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - if (ret.Failed()) return CMD_ERROR; + if (ret.Failed()) return ret; if (!Depot::CanAllocateItem()) return CMD_ERROR; @@ -204,14 +204,14 @@ static CommandCost DoBuildShiplift(TileIndex tile, DiagDirection dir, DoCommandF /* middle tile */ ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - if (ret.Failed()) return CMD_ERROR; + if (ret.Failed()) return ret; delta = TileOffsByDiagDir(dir); /* lower tile */ WaterClass wc_lower = IsWaterTile(tile - delta) ? GetWaterClass(tile - delta) : WATER_CLASS_CANAL; ret = DoCommand(tile - delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - if (ret.Failed()) return CMD_ERROR; + if (ret.Failed()) return ret; if (GetTileSlope(tile - delta, NULL) != SLOPE_FLAT) { return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION); } @@ -220,7 +220,7 @@ static CommandCost DoBuildShiplift(TileIndex tile, DiagDirection dir, DoCommandF WaterClass wc_upper = IsWaterTile(tile + delta) ? GetWaterClass(tile + delta) : WATER_CLASS_CANAL; ret = DoCommand(tile + delta, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - if (ret.Failed()) return CMD_ERROR; + if (ret.Failed()) return ret; if (GetTileSlope(tile + delta, NULL) != SLOPE_FLAT) { return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION); } |