petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r6142) -Codechange: added WaypointID (sorry DV, couldn't splits it anymore)

Browse Source 
-Codechange: introduced DestinationID, which is in fact an union of several types
  Used in Order struct, so no longer StationID is abused for all targets.
  Hangars are a big exception, as they use a station-id with GOTO_DEPOT (go figure)
This commit is contained in:
truelight
2006-08-26 16:34:03 +00:00
parent f73a2829f3
commit db8dfcd6e9
23 changed files with 172 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
station_cmd.c
View File

@@ -1863,7 +1863,7 @@ static bool CheckShipsOnBuoy(Station *st)
if (v->type == VEH_Ship) {
const Order *order;
FOR_VEHICLE_ORDERS(v, order) {
if (order->type == OT_GOTO_STATION && order->station == st->index) {
if (order->type == OT_GOTO_STATION && order->dest.station == st->index) {
return true;
}
}
@@ -2333,7 +2333,7 @@ static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y)
StationID station_id = GetStationIndex(tile);
if ((!(v->current_order.flags & OF_NON_STOP) && !_patches.new_nonstop) ||
(v->current_order.type == OT_GOTO_STATION && v->current_order.station == station_id)) {
(v->current_order.type == OT_GOTO_STATION && v->current_order.dest.station == station_id)) {
if (!(_patches.new_nonstop && v->current_order.flags & OF_NON_STOP) &&
v->current_order.type != OT_LEAVESTATION &&
v->last_station_visited != station_id) {
@@ -2412,7 +2412,7 @@ static void DeleteStation(Station *st)
DeleteWindowById(WC_STATION_VIEW, index);
/* Now delete all orders that go to the station */
RemoveOrderFromAllVehicles(OT_GOTO_STATION, index);
RemoveOrderFromAllVehicles(OT_GOTO_STATION, (DestinationID)index);
//And do the same with aircraft that have the station as a hangar-stop
FOR_ALL_VEHICLES(v) {
@@ -2420,7 +2420,7 @@ static void DeleteStation(Station *st)
if (v->type == VEH_Aircraft) {
Order *order;
FOR_VEHICLE_ORDERS(v, order) {
if (order->type == OT_GOTO_DEPOT && order->station == index) {
if (order->type == OT_GOTO_DEPOT && order->dest.station == index) {
order->type = OT_DUMMY;
order->flags = 0;
invalidate = true;