# HG changeset patch # User bjarni # Date 2007-05-26 20:30:55 # Node ID a1636839fa864e2c7f89bcdc6fdca864f0d742ad # Parent 8f38bbf425fc9a0515f19318e0ae5eb582d6cf08 (svn r9941) -Fix: trams could be cloned to appear in normal road depots and vice versa (spotted by Desolator) diff --git a/src/lang/english.txt b/src/lang/english.txt --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3030,6 +3030,7 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP ### depot strings STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}You are about to sell all the vehicles in the depot. Are you sure? +STR_DEPOT_WRONG_DEPOT_TYPE :Wrong depot type STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Sell all trains in the depot STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Sell all road vehicles in the depot diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -145,6 +145,8 @@ int32 CmdBuildRoadVeh(TileIndex tile, ui if (!IsTileDepotType(tile, TRANSPORT_ROAD)) return CMD_ERROR; if (!IsTileOwner(tile, _current_player)) return CMD_ERROR; + if (HASBIT(GetRoadTypes(tile), ROADTYPE_TRAM) != HASBIT(EngInfo(p1)->misc_flags, EF_ROAD_TRAM)) return_cmd_error(STR_DEPOT_WRONG_DEPOT_TYPE); + v = AllocateVehicle(); if (v == NULL) return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);