diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -672,7 +672,6 @@ CommandCost CheckBuildableTile(TileIndex } CommandCost ret = EnsureNoVehicleOnGround(tile); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; uint z; @@ -867,7 +866,6 @@ static CommandCost CheckFlatLandRoadStop if (!_settings_game.construction.road_stop_on_town_road) return_cmd_error(STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD); } else if (!_settings_game.construction.road_stop_on_competitor_road && road_owner != OWNER_NONE) { CommandCost ret = CheckOwnership(road_owner); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } num_roadbits += CountBits(GetRoadBits(cur_tile, ROADTYPE_ROAD)); @@ -878,7 +876,6 @@ static CommandCost CheckFlatLandRoadStop Owner tram_owner = GetRoadOwner(cur_tile, ROADTYPE_TRAM); if (!_settings_game.construction.road_stop_on_competitor_road && tram_owner != OWNER_NONE) { CommandCost ret = CheckOwnership(tram_owner); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } num_roadbits += CountBits(GetRoadBits(cur_tile, ROADTYPE_TRAM)); @@ -1110,7 +1107,6 @@ CommandCost CmdBuildRailStation(TileInde /* Does the authority allow this? */ CommandCost ret = CheckIfAuthorityAllowsNewStation(tile_org, flags); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; if (!ValParamRailtype(rt)) return CMD_ERROR; @@ -1151,7 +1147,6 @@ CommandCost CmdBuildRailStation(TileInde Station *st = NULL; ret = FindJoiningStation(est, station_to_join, adjacent, new_location, &st); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; /* See if there is a deleted station close to us. */ @@ -1167,13 +1162,11 @@ CommandCost CmdBuildRailStation(TileInde if (!_settings_game.station.join_stations) return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD); CommandCost ret = CanExpandRailStation(st, new_location, axis); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } /* XXX can't we pack this in the "else" part of the if above? */ CommandCost ret = st->rect.BeforeAddRect(tile_org, w_org, h_org, StationRect::ADD_TEST); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } else { /* allocate and initialize new station */ @@ -1379,10 +1372,7 @@ CommandCost RemoveFromRailBaseStation(Ti /* If there is a vehicle on ground, do not allow to remove (flood) the tile */ CommandCost ret = EnsureNoVehicleOnGround(tile); - if (ret.Failed()) { - ret.SetGlobalErrorMessage(); - continue; - } + if (ret.Failed()) continue; /* Check ownership of station */ T *st = T::GetByTile(tile); @@ -1390,10 +1380,7 @@ CommandCost RemoveFromRailBaseStation(Ti if (_current_company != OWNER_WATER) { CommandCost ret = CheckOwnership(st->owner); - if (ret.Failed()) { - ret.SetGlobalErrorMessage(); - continue; - } + if (ret.Failed()) continue; } /* Do not allow removing from stations if non-uniform stations are not enabled @@ -1542,7 +1529,6 @@ CommandCost RemoveRailStation(T *st, DoC /* Current company owns the station? */ if (_current_company != OWNER_WATER) { CommandCost ret = CheckOwnership(st->owner); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } @@ -1558,7 +1544,6 @@ CommandCost RemoveRailStation(T *st, DoC if (!st->TileBelongsToRailStation(tile)) continue; CommandCost ret = EnsureNoVehicleOnGround(tile); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; cost.AddCost(_price[PR_CLEAR_STATION_RAIL]); @@ -1725,7 +1710,6 @@ CommandCost CmdBuildRoadStop(TileIndex t if (is_drive_through && !IsValidAxis((Axis)ddir)) return CMD_ERROR; CommandCost ret = CheckIfAuthorityAllowsNewStation(tile, flags); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; /* Total road stop cost. */ @@ -1737,7 +1721,6 @@ CommandCost CmdBuildRoadStop(TileIndex t Station *st = NULL; ret = FindJoiningRoadStop(est, station_to_join, HasBit(p2, 5), roadstop_area, &st); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; /* Find a deleted station close to us */ @@ -1752,7 +1735,6 @@ CommandCost CmdBuildRoadStop(TileIndex t } CommandCost ret = st->rect.BeforeAddRect(roadstop_area.tile, roadstop_area.w, roadstop_area.h, StationRect::ADD_TEST); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } else { /* allocate and initialize new station */ @@ -1846,7 +1828,6 @@ static CommandCost RemoveRoadStop(TileIn if (_current_company != OWNER_WATER) { CommandCost ret = CheckOwnership(st->owner); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } @@ -1870,7 +1851,6 @@ static CommandCost RemoveRoadStop(TileIn if (flags & DC_EXEC) FindVehicleOnPos(tile, NULL, &ClearRoadStopStatusEnum); } else { CommandCost ret = EnsureNoVehicleOnGround(tile); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } @@ -2108,7 +2088,6 @@ CommandCost CmdBuildAirport(TileIndex ti if (airport_type >= NUM_AIRPORTS) return CMD_ERROR; CommandCost ret = CheckIfAuthorityAllowsNewStation(tile, flags); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; /* Check if a valid, buildable airport was chosen for construction */ @@ -2156,7 +2135,6 @@ CommandCost CmdBuildAirport(TileIndex ti Station *st = NULL; ret = FindJoiningStation(INVALID_STATION, station_to_join, HasBit(p2, 0), TileArea(tile, w, h), &st); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; /* Distant join */ @@ -2171,7 +2149,6 @@ CommandCost CmdBuildAirport(TileIndex ti } CommandCost ret = st->rect.BeforeAddRect(tile, w, h, StationRect::ADD_TEST); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; if (st->airport.tile != INVALID_TILE) { @@ -2263,7 +2240,6 @@ static CommandCost RemoveAirport(TileInd if (_current_company != OWNER_WATER) { CommandCost ret = CheckOwnership(st->owner); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; } @@ -2281,7 +2257,6 @@ static CommandCost RemoveAirport(TileInd if (!st->TileBelongsToAirport(tile_cur)) continue; CommandCost ret = EnsureNoVehicleOnGround(tile_cur); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; cost.AddCost(_price[PR_CLEAR_STATION_AIRPORT]); @@ -2381,13 +2356,11 @@ CommandCost CmdBuildDock(TileIndex tile, if (IsWaterTile(tile)) return_cmd_error(STR_ERROR_SITE_UNSUITABLE); CommandCost ret = CheckIfAuthorityAllowsNewStation(tile, flags); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; TileIndex tile_cur = tile + TileOffsByDiagDir(direction); @@ -2402,7 +2375,6 @@ CommandCost CmdBuildDock(TileIndex tile, WaterClass wc = GetWaterClass(tile_cur); ret = DoCommand(tile_cur, 0, 0, flags, CMD_LANDSCAPE_CLEAR); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; tile_cur += TileOffsByDiagDir(direction); @@ -2415,7 +2387,6 @@ CommandCost CmdBuildDock(TileIndex tile, ret = FindJoiningStation(INVALID_STATION, station_to_join, HasBit(p1, 0), TileArea(tile + ToTileIndexDiff(_dock_tileoffs_chkaround[direction]), _dock_w_chk[direction], _dock_h_chk[direction]), &st); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; /* Distant join */ @@ -2432,7 +2403,6 @@ CommandCost CmdBuildDock(TileIndex tile, CommandCost ret = st->rect.BeforeAddRect( tile + ToTileIndexDiff(_dock_tileoffs_chkaround[direction]), _dock_w_chk[direction], _dock_h_chk[direction], StationRect::ADD_TEST); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; if (st->dock_tile != INVALID_TILE) return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK); @@ -2483,7 +2453,6 @@ static CommandCost RemoveDock(TileIndex { Station *st = Station::GetByTile(tile); CommandCost ret = CheckOwnership(st->owner); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; TileIndex tile1 = st->dock_tile; @@ -2491,7 +2460,6 @@ static CommandCost RemoveDock(TileIndex ret = EnsureNoVehicleOnGround(tile1); if (ret.Succeeded()) ret = EnsureNoVehicleOnGround(tile2); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; if (flags & DC_EXEC) { @@ -3222,7 +3190,6 @@ CommandCost CmdRenameStation(TileIndex t if (st == NULL) return CMD_ERROR; CommandCost ret = CheckOwnership(st->owner); - ret.SetGlobalErrorMessage(); if (ret.Failed()) return ret; bool reset = StrEmpty(text);