mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-17 11:39:11 +00:00
Code Issues Activity

(svn r4937) Reduce the use of _error_message a bit

Browse Source
This commit is contained in:
tron
2006-05-21 11:34:08 +00:00
parent e693290ed1
commit 1706164ff7
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tunnelbridge_cmd.c
View File

@@ -656,10 +656,7 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags)
endtile - delta,
GetBridgeHeightRamp(tile) + TILE_HEIGHT
);
if (v != NULL) {
VehicleInTheWayErrMsg(v);
return CMD_ERROR;
}
if (v != NULL) return_cmd_error(VehicleInTheWayErrMsg(v));
t = ClosestTownFromTile(tile, (uint)-1); //needed for town rating penalty
// check if you're allowed to remove the bridge owned by a town.
@@ -770,13 +767,11 @@ int32 DoConvertTunnelBridgeRail(TileIndex tile, RailType totype, bool exec)
// Make sure there's no vehicle on the bridge
v = FindVehicleBetween(tile, endtile, z);
if (v != NULL) {
VehicleInTheWayErrMsg(v);
return CMD_ERROR;
return_cmd_error(VehicleInTheWayErrMsg(v));
}
if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(endtile)) {
_error_message = STR_8803_TRAIN_IN_THE_WAY;
return CMD_ERROR;
return_cmd_error(STR_8803_TRAIN_IN_THE_WAY);
}
if (GetRailType(tile) == totype) return CMD_ERROR;