diff options
| author | tron <tron@openttd.org> | 2006-09-03 08:25:27 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-09-03 08:25:27 +0000 |
| commit | d5e5a78cf414eb143741f6fc15d8245f5197b3c9 (patch) | |
| tree | 79ebec494a87cd0b8e16e577740868f5bf90a7d2 /ai/trolly/trolly.c | |
| parent | 5a86b502c2f553096f88d7f84241e0f3e581fcb2 (diff) | |
| download | openttd-d5e5a78cf414eb143741f6fc15d8245f5197b3c9.tar.xz | |
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
DestinationID being a union of these types is just hassle without benefit and cannot be handled correctly everywhere because of local lack of information
Diffstat (limited to 'ai/trolly/trolly.c')
| -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 e91c3a171..8ce569d80 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->dest.station) == st) { + if (order->type == OT_GOTO_STATION && GetStation(order->dest) == 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.dest.depot = GetDepotByTile(p->ainew.depot_tile)->index; + order.dest = 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.dest.station = GetStationIndex(p->ainew.to_tile); + order.dest = 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.dest.station = GetStationIndex(p->ainew.from_tile); + order.dest = 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); |