mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20579) -Change (r1579): Allow removing of buoys if they are only used by own vehicles.

release/1.1
frosch 2010-08-20 12:50:59 +00:00
parent de973a4d60
commit 03ab158935
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english.txt
View File

@ -3548,7 +3548,7 @@ STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME :{WHITE}Can't ch
STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Can't remove train waypoint here... STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT :{WHITE}Can't remove train waypoint here...
STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Must remove rail waypoint first STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST :{WHITE}Must remove rail waypoint first
STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... buoy in the way STR_ERROR_BUOY_IN_THE_WAY :{WHITE}... buoy in the way
STR_ERROR_BUOY_IS_IN_USE :{WHITE}... buoy is in use! STR_ERROR_BUOY_IS_IN_USE :{WHITE}... buoy is in use by another company!
# Depot related errors # Depot related errors
STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT :{WHITE}Can't build train depot here... STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT :{WHITE}Can't build train depot here...

8
src/station_cmd.cpp
View File

@ -2331,15 +2331,15 @@ static CommandCost RemoveAirport(TileIndex tile, DoCommandFlag flags)
/** /**
* Tests whether the company's vehicles have this station in orders * Tests whether the company's vehicles have this station in orders
* When company == INVALID_COMPANY, then check all vehicles
* @param station station ID * @param station station ID
* @param company company ID, INVALID_COMPANY to disable the check * @param include_company If true only check vehicles of \a company, if false only check vehicles of other companies
* @param company company ID
*/ */
bool HasStationInUse(StationID station, CompanyID company) bool HasStationInUse(StationID station, bool include_company, CompanyID company)
{ {
const Vehicle *v; const Vehicle *v;
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
if (company == INVALID_COMPANY || v->owner == company) { if ((v->owner == company) == include_company) {
const Order *order; const Order *order;
FOR_VEHICLE_ORDERS(v, order) { FOR_VEHICLE_ORDERS(v, order) {
if ((order->IsType(OT_GOTO_STATION) || order->IsType(OT_GOTO_WAYPOINT)) && order->GetDestination() == station) { if ((order->IsType(OT_GOTO_STATION) || order->IsType(OT_GOTO_WAYPOINT)) && order->GetDestination() == station) {

2
src/station_func.h
View File

@ -34,7 +34,7 @@ void UpdateStationAcceptance(Station *st, bool show_msg);
const DrawTileSprites *GetStationTileLayout(StationType st, byte gfx); const DrawTileSprites *GetStationTileLayout(StationType st, byte gfx);
void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, RoadType roadtype, int image); void StationPickerDrawSprite(int x, int y, StationType st, RailType railtype, RoadType roadtype, int image);
bool HasStationInUse(StationID station, CompanyID company); bool HasStationInUse(StationID station, bool include_company, CompanyID company);
RoadStop *GetRoadStopByTile(TileIndex tile, RoadStopType type); RoadStop *GetRoadStopByTile(TileIndex tile, RoadStopType type);
uint GetNumRoadStops(const Station *st, RoadStopType type); uint GetNumRoadStops(const Station *st, RoadStopType type);

2
src/station_gui.cpp
View File

@ -234,7 +234,7 @@ protected:
const Station *st; const Station *st;
FOR_ALL_STATIONS(st) { FOR_ALL_STATIONS(st) {
if (st->owner == owner || (st->owner == OWNER_NONE && HasStationInUse(st->index, owner))) { if (st->owner == owner || (st->owner == OWNER_NONE && HasStationInUse(st->index, true, owner))) {
if (this->facilities & st->facilities) { // only stations with selected facilities if (this->facilities & st->facilities) { // only stations with selected facilities
int num_waiting_cargo = 0; int num_waiting_cargo = 0;
for (CargoID j = 0; j < NUM_CARGO; j++) { for (CargoID j = 0; j < NUM_CARGO; j++) {

2
src/waypoint_cmd.cpp
View File

@ -333,7 +333,7 @@ CommandCost RemoveBuoy(TileIndex tile, DoCommandFlag flags)
Waypoint *wp = Waypoint::GetByTile(tile); Waypoint *wp = Waypoint::GetByTile(tile);
if (HasStationInUse(wp->index, INVALID_COMPANY)) return_cmd_error(STR_ERROR_BUOY_IS_IN_USE); if (HasStationInUse(wp->index, false, _current_company)) return_cmd_error(STR_ERROR_BUOY_IS_IN_USE);
/* remove the buoy if there is a ship on tile when company goes bankrupt... */ /* remove the buoy if there is a ship on tile when company goes bankrupt... */
if (!(flags & DC_BANKRUPT)) { if (!(flags & DC_BANKRUPT)) {
CommandCost ret = EnsureNoVehicleOnGround(tile); CommandCost ret = EnsureNoVehicleOnGround(tile);