Mercurial > hg > openttd
changeset 8109:eaab22131e32 draft
(svn r11670) -Feature [FS#1565]: list neutral stations where the player has service in the station list too
author | smatz <smatz@openttd.org> |
---|---|
date | Wed, 19 Dec 2007 23:35:14 +0000 |
parents | 4faab45e2603 |
children | 17de964e4d9f |
files | src/station.h src/station_cmd.cpp src/station_gui.cpp |
diffstat | 3 files changed, 20 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/station.h +++ b/src/station.h @@ -294,6 +294,8 @@ RoadStop * AllocateRoadStop(); void ClearSlot(Vehicle *v); +bool HasStationInUse(StationID station, PlayerID player); + void DeleteOilRig(TileIndex t); #endif /* STATION_H */
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1868,15 +1868,20 @@ return CommandCost(_price.build_dock); } -/* Checks if any ship is servicing the buoy specified. Returns yes or no */ -static bool CheckShipsOnBuoy(Station *st) +/** + * Tests whether the player's vehicles have this station in orders + * When player == INVALID_PLAYER, then check all vehicles + * @param station station ID + * @param player player ID, INVALID_PLAYER to disable the check + */ +bool HasStationInUse(StationID station, PlayerID player) { const Vehicle *v; FOR_ALL_VEHICLES(v) { - if (v->type == VEH_SHIP) { + if (player == INVALID_PLAYER || v->owner == player) { const Order *order; FOR_VEHICLE_ORDERS(v, order) { - if (order->type == OT_GOTO_STATION && order->dest == st->index) { + if (order->type == OT_GOTO_STATION && order->dest == station) { return true; } } @@ -1892,7 +1897,7 @@ TileIndex tile = st->dock_tile; - if (CheckShipsOnBuoy(st)) return_cmd_error(STR_BUOY_IS_IN_USE); + if (HasStationInUse(st->index, INVALID_PLAYER)) return_cmd_error(STR_BUOY_IS_IN_USE); if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; if (flags & DC_EXEC) {
--- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -25,6 +25,7 @@ #include "helpers.hpp" #include "cargotype.h" #include "station_gui.h" +#include "station.h" typedef int CDECL StationSortListingTypeFunction(const void*, const void*); @@ -233,7 +234,7 @@ DEBUG(misc, 3, "Building station list for player %d", owner); FOR_ALL_STATIONS(st) { - if (st->owner == owner) { + if (st->owner == owner || (st->owner == OWNER_NONE && !st->IsBuoy() && HasStationInUse(st->index, owner))) { if (facilities & st->facilities) { //only stations with selected facilities int num_waiting_cargo = 0; for (CargoID j = 0; j < NUM_CARGO; j++) { @@ -380,7 +381,10 @@ int x; assert(st->xy != 0); - assert(st->owner == owner); + + /* Do not do the complex check HasStationInUse here, it may be even false + * when the order had been removed and the station list hasn't been removed yet */ + assert(st->owner == owner || (st->owner == OWNER_NONE && !st->IsBuoy())); SetDParam(0, st->index); SetDParam(1, st->facilities); @@ -410,7 +414,8 @@ if (id_v >= sl->list_length) return; // click out of list bound const Station *st = sl->sort_list[id_v]; - assert(st->owner == owner); + /* do not check HasStationInUse - it is slow and may be invalid */ + assert(st->owner == owner || (st->owner == OWNER_NONE && !st->IsBuoy())); ScrollMainWindowToTile(st->xy); break; }