Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-19 15:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3812) Remove a pointless goto

Browse Source
This commit is contained in:
tron 2006-03-10 11:27:52 +00:00
parent eac8e5e473
commit ec8f335e9d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
road_cmd.c
View File

@ -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 (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) return CMD_ERROR;
if ((ti.map5 & 0xE9) == 0xE8) { 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) { } else if ((ti.map5 & 0xE9) == 0xE9) {
if (pieces & ROAD_Y) goto return_error; if (pieces & ROAD_Y) return CMD_ERROR;
} else { } else {
goto return_error; return CMD_ERROR;
} }
cost = _price.remove_road * 2; 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. // limit the bits to delete to the existing bits.
c &= present; c &= present;
if (c == 0) goto return_error; if (c == 0) return CMD_ERROR;
// calculate the cost // calculate the cost
cost = 0; cost = 0;
@ -188,7 +188,7 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
case ROAD_CROSSING: { case ROAD_CROSSING: {
if (pieces & ComplementRoadBits(GetCrossingRoadBits(tile))) { if (pieces & ComplementRoadBits(GetCrossingRoadBits(tile))) {
goto return_error; return CMD_ERROR;
} }
cost = _price.remove_road * 2; cost = _price.remove_road * 2;
@ -203,12 +203,10 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
default: default:
case ROAD_DEPOT: case ROAD_DEPOT:
goto return_error; return CMD_ERROR;
} }
default: default: return CMD_ERROR;
return_error:;
return_cmd_error(INVALID_STRING_ID);
} }
} }