diff options
| author | tron <tron@openttd.org> | 2006-03-10 11:27:52 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-03-10 11:27:52 +0000 |
| commit | ec8f335e9d0d2616aac62b135176ea2bd92e9acd (patch) | |
| tree | df18835414578d1fc809e39869326e63e0666932 | |
| parent | eac8e5e4733346723f87cfbc1c97d7ed2cea0bf4 (diff) | |
| download | openttd-ec8f335e9d0d2616aac62b135176ea2bd92e9acd.tar.xz | |
(svn r3812) Remove a pointless goto
| -rw-r--r-- | road_cmd.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/road_cmd.c b/road_cmd.c index ca558e29c..55556553e 100644 --- a/road_cmd.c +++ b/road_cmd.c @@ -129,11 +129,11 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) return CMD_ERROR; if ((ti.map5 & 0xE9) == 0xE8) { - if (pieces & ROAD_X) goto return_error; + if (pieces & ROAD_X) return CMD_ERROR; } else if ((ti.map5 & 0xE9) == 0xE9) { - if (pieces & ROAD_Y) goto return_error; + if (pieces & ROAD_Y) return CMD_ERROR; } else { - goto return_error; + return CMD_ERROR; } cost = _price.remove_road * 2; @@ -163,7 +163,7 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) // limit the bits to delete to the existing bits. c &= present; - if (c == 0) goto return_error; + if (c == 0) return CMD_ERROR; // calculate the cost cost = 0; @@ -188,7 +188,7 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) case ROAD_CROSSING: { if (pieces & ComplementRoadBits(GetCrossingRoadBits(tile))) { - goto return_error; + return CMD_ERROR; } cost = _price.remove_road * 2; @@ -203,12 +203,10 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2) default: case ROAD_DEPOT: - goto return_error; + return CMD_ERROR; } - default: -return_error:; - return_cmd_error(INVALID_STRING_ID); + default: return CMD_ERROR; } } |