diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-06 15:09:45 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-06 15:09:45 +0000 |
| commit | 53d101cc992ff7e5a4839e0598b1b88170300e74 (patch) | |
| tree | 902d510152ab0f94357b64fda309b662a1637e12 /src/ai | |
| parent | e150643d319c82c54a8246b0aeb8c30a6f2a52d5 (diff) | |
| download | openttd-53d101cc992ff7e5a4839e0598b1b88170300e74.tar.xz | |
(svn r12593) -Codechange: hide Order's flags in most of the code.
Diffstat (limited to 'src/ai')
| -rw-r--r-- | src/ai/default/default.cpp | 12 | ||||
| -rw-r--r-- | src/ai/trolly/trolly.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index 2408674af..35407ed56 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.flags |= OFB_UNLOAD; + if (!is_pass && i == 1) order.SetUnloadType(OFB_UNLOAD); if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0)) - order.flags |= OFB_FULL_LOAD; + order.SetLoadType(OFB_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.flags |= OFB_UNLOAD; + if (!is_pass && i == 1) order.SetUnloadType(OFB_UNLOAD); if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0)) - order.flags |= OFB_FULL_LOAD; + order.SetLoadType(OFB_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.flags |= OFB_UNLOAD; + if (!is_pass && i == 1) order.SetUnloadType(OFB_UNLOAD); if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0)) - order.flags |= OFB_FULL_LOAD; + order.SetLoadType(OFB_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 46aa0f10d..d62044705 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -1191,13 +1191,13 @@ 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.flags |= OFB_FULL_LOAD; + order.SetLoadType(OFB_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.flags |= OFB_FULL_LOAD; + order.SetLoadType(OFB_FULL_LOAD); AI_DoCommand(0, _players_ainew[p->index].veh_id + (idx << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER); // Start the engines! |