summaryrefslogtreecommitdiff
path: root/ai
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-09-03 08:25:27 +0000
committertron <tron@openttd.org>2006-09-03 08:25:27 +0000
commit1c21c645ae04601cd3711b37e6541d807cb727a7 (patch)
tree79ebec494a87cd0b8e16e577740868f5bf90a7d2 /ai
parent302772883ce9dd965ca6dfe9ade85530c6de8210 (diff)
downloadopenttd-1c21c645ae04601cd3711b37e6541d807cb727a7.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')
-rw-r--r--ai/default/default.c8
-rw-r--r--ai/trolly/trolly.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/ai/default/default.c b/ai/default/default.c
index ef794a9ca..e2971a432 100644
--- a/ai/default/default.c
+++ b/ai/default/default.c
@@ -2453,7 +2453,7 @@ handle_nocash:
order.type = OT_GOTO_STATION;
order.flags = 0;
- order.dest.station = AiGetStationIdByDef(aib->use_tile, aib->cur_building_rule);
+ order.dest = AiGetStationIdByDef(aib->use_tile, aib->cur_building_rule);
if (!is_pass && i == 1) order.flags |= OF_UNLOAD;
if (p->ai.num_want_fullload != 0 && (is_pass || i == 0))
@@ -3185,7 +3185,7 @@ static void AiStateBuildRoadVehicles(Player *p)
order.type = OT_GOTO_STATION;
order.flags = 0;
- order.dest.station = AiGetStationIdFromRoadBlock(aib->use_tile, aib->cur_building_rule);
+ order.dest = AiGetStationIdFromRoadBlock(aib->use_tile, aib->cur_building_rule);
if (!is_pass && i == 1) order.flags |= OF_UNLOAD;
if (p->ai.num_want_fullload != 0 && (is_pass || i == 0))
@@ -3464,7 +3464,7 @@ static void AiStateBuildAircraftVehicles(Player *p)
order.type = OT_GOTO_STATION;
order.flags = 0;
- order.dest.station = AiGetStationIdFromAircraftBlock(aib->use_tile, aib->cur_building_rule);
+ order.dest = AiGetStationIdFromAircraftBlock(aib->use_tile, aib->cur_building_rule);
if (!is_pass && i == 1) order.flags |= OF_UNLOAD;
if (p->ai.num_want_fullload != 0 && (is_pass || i == 0))
@@ -3567,7 +3567,7 @@ static void AiStateRemoveStation(Player *p)
in_use = malloc(GetStationArraySize());
memset(in_use, 0, GetStationArraySize());
FOR_ALL_ORDERS(ord) {
- if (ord->type == OT_GOTO_STATION) in_use[ord->dest.station] = 1;
+ if (ord->type == OT_GOTO_STATION) in_use[ord->dest] = 1;
}
// Go through all stations and delete those that aren't in use
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);