diff options
| author | truelight <truelight@openttd.org> | 2006-08-26 16:34:03 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-08-26 16:34:03 +0000 |
| commit | db8dfcd6e90f13ed0aafec06fc5975967afb1bb5 (patch) | |
| tree | 7f558c2b1487df44a464aa980693e44cb438c592 /ai/trolly | |
| parent | f73a2829f364b07d6f944b8b49e156b9774db39b (diff) | |
| download | openttd-db8dfcd6e90f13ed0aafec06fc5975967afb1bb5.tar.xz | |
(svn r6142) -Codechange: added WaypointID (sorry DV, couldn't splits it anymore)
-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)
Diffstat (limited to 'ai/trolly')
| -rw-r--r-- | ai/trolly/trolly.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ai/trolly/trolly.c b/ai/trolly/trolly.c index 7d3398cec..e91c3a171 100644 --- a/ai/trolly/trolly.c +++ b/ai/trolly/trolly.c @@ -555,7 +555,7 @@ static bool AiNew_CheckVehicleStation(Player *p, Station *st) const Order *order; FOR_VEHICLE_ORDERS(v, order) { - if (order->type == OT_GOTO_STATION && GetStation(order->station) == st) { + if (order->type == OT_GOTO_STATION && GetStation(order->dest.station) == st) { // This vehicle has this city in its list count++; } @@ -1192,14 +1192,14 @@ static void AiNew_State_GiveOrders(Player *p) idx = 0; order.type = OT_GOTO_DEPOT; order.flags = OF_UNLOAD; - order.station = GetDepotByTile(p->ainew.depot_tile)->index; + order.dest.depot = GetDepotByTile(p->ainew.depot_tile)->index; AI_DoCommand(0, p->ainew.veh_id + (idx << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); } idx = 0; order.type = OT_GOTO_STATION; order.flags = 0; - order.station = GetStationIndex(p->ainew.to_tile); + order.dest.station = GetStationIndex(p->ainew.to_tile); if (p->ainew.tbt == AI_TRUCK && p->ainew.to_deliver) order.flags |= OF_FULL_LOAD; AI_DoCommand(0, p->ainew.veh_id + (idx << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); @@ -1207,7 +1207,7 @@ static void AiNew_State_GiveOrders(Player *p) idx = 0; order.type = OT_GOTO_STATION; order.flags = 0; - order.station = GetStationIndex(p->ainew.from_tile); + order.dest.station = GetStationIndex(p->ainew.from_tile); if (p->ainew.tbt == AI_TRUCK && p->ainew.from_deliver) order.flags |= OF_FULL_LOAD; AI_DoCommand(0, p->ainew.veh_id + (idx << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); |