summaryrefslogtreecommitdiff
path: root/src/ai
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-04-07 20:03:46 +0000
committerrubidium <rubidium@openttd.org>2008-04-07 20:03:46 +0000
commitd74c6ffb6248b65171b702ab038415904de0b7dd (patch)
tree6b2bd1bb1a800edf7ded9987b1d3796b6f33a7c3 /src/ai
parent42a66ef9903d12cf748ddc6b3c4dcfaaef1c5efd (diff)
downloadopenttd-d74c6ffb6248b65171b702ab038415904de0b7dd.tar.xz
(svn r12617) -Codechange: add type safety to the Order's load and unload types.
Diffstat (limited to 'src/ai')
-rw-r--r--src/ai/default/default.cpp12
-rw-r--r--src/ai/trolly/trolly.cpp6
2 files changed, 8 insertions, 10 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
index 35407ed56..9a563e96a 100644
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -2554,9 +2554,9 @@ handle_nocash:
order.MakeGoToStation(AiGetStationIdByDef(aib->use_tile, aib->cur_building_rule));
- if (!is_pass && i == 1) order.SetUnloadType(OFB_UNLOAD);
+ if (!is_pass && i == 1) order.SetUnloadType(OUFB_UNLOAD);
if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0))
- order.SetLoadType(OFB_FULL_LOAD);
+ order.SetLoadType(OLFB_FULL_LOAD);
DoCommand(0, loco_id + (i << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER);
}
@@ -3289,9 +3289,9 @@ static void AiStateBuildRoadVehicles(Player *p)
order.MakeGoToStation(AiGetStationIdFromRoadBlock(aib->use_tile, aib->cur_building_rule));
- if (!is_pass && i == 1) order.SetUnloadType(OFB_UNLOAD);
+ if (!is_pass && i == 1) order.SetUnloadType(OUFB_UNLOAD);
if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0))
- order.SetLoadType(OFB_FULL_LOAD);
+ order.SetLoadType(OLFB_FULL_LOAD);
DoCommand(0, loco_id + (i << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER);
}
@@ -3568,9 +3568,9 @@ static void AiStateBuildAircraftVehicles(Player *p)
order.MakeGoToStation(AiGetStationIdFromAircraftBlock(aib->use_tile, aib->cur_building_rule));
- if (!is_pass && i == 1) order.SetUnloadType(OFB_UNLOAD);
+ if (!is_pass && i == 1) order.SetUnloadType(OUFB_UNLOAD);
if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0))
- order.SetLoadType(OFB_FULL_LOAD);
+ order.SetLoadType(OLFB_FULL_LOAD);
DoCommand(0, loco_id + (i << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER);
}
diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp
index 9170950df..e047a5a29 100644
--- a/src/ai/trolly/trolly.cpp
+++ b/src/ai/trolly/trolly.cpp
@@ -1190,14 +1190,12 @@ static void AiNew_State_GiveOrders(Player *p)
idx = 0;
order.MakeGoToStation(GetStationIndex(_players_ainew[p->index].to_tile));
- if (_players_ainew[p->index].tbt == AI_TRUCK && _players_ainew[p->index].to_deliver)
- order.SetLoadType(OFB_FULL_LOAD);
+ if (_players_ainew[p->index].tbt == AI_TRUCK && _players_ainew[p->index].to_deliver) order.SetLoadType(OLFB_FULL_LOAD);
AI_DoCommand(0, _players_ainew[p->index].veh_id + (idx << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER);
idx = 0;
order.MakeGoToStation(GetStationIndex(_players_ainew[p->index].from_tile));
- if (_players_ainew[p->index].tbt == AI_TRUCK && _players_ainew[p->index].from_deliver)
- order.SetLoadType(OFB_FULL_LOAD);
+ if (_players_ainew[p->index].tbt == AI_TRUCK && _players_ainew[p->index].from_deliver) order.SetLoadType(OLFB_FULL_LOAD);
AI_DoCommand(0, _players_ainew[p->index].veh_id + (idx << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER);
// Start the engines!