diff options
| author | rubidium <rubidium@openttd.org> | 2008-01-15 18:44:22 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-01-15 18:44:22 +0000 |
| commit | 576f8ad93e5eb2d2c2777ae1e448ae80e80d14ba (patch) | |
| tree | 7948f0844d640b0be32729fdeaf9be3da5453758 /src/ai | |
| parent | ab7cb0804de68b015dcc774a4fbcc82e356d2c87 (diff) | |
| download | openttd-576f8ad93e5eb2d2c2777ae1e448ae80e80d14ba.tar.xz | |
(svn r11866) -Codechange: swap OFB_* and OF_* so it conceptually in sync with other cases of *B_* vs *_* like VETSB_* and VETS_*.
Diffstat (limited to 'src/ai')
| -rw-r--r-- | src/ai/default/default.cpp | 12 | ||||
| -rw-r--r-- | src/ai/trolly/trolly.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index 4c5af1e38..f582e1edf 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -2516,9 +2516,9 @@ handle_nocash: order.flags = 0; order.dest = AiGetStationIdByDef(aib->use_tile, aib->cur_building_rule); - if (!is_pass && i == 1) order.flags |= OF_UNLOAD; + if (!is_pass && i == 1) order.flags |= OFB_UNLOAD; if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0)) - order.flags |= OF_FULL_LOAD; + order.flags |= OFB_FULL_LOAD; DoCommand(0, loco_id + (i << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); } @@ -3258,9 +3258,9 @@ static void AiStateBuildRoadVehicles(Player *p) order.flags = 0; order.dest = AiGetStationIdFromRoadBlock(aib->use_tile, aib->cur_building_rule); - if (!is_pass && i == 1) order.flags |= OF_UNLOAD; + if (!is_pass && i == 1) order.flags |= OFB_UNLOAD; if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0)) - order.flags |= OF_FULL_LOAD; + order.flags |= OFB_FULL_LOAD; DoCommand(0, loco_id + (i << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); } @@ -3526,9 +3526,9 @@ static void AiStateBuildAircraftVehicles(Player *p) order.flags = 0; order.dest = AiGetStationIdFromAircraftBlock(aib->use_tile, aib->cur_building_rule); - if (!is_pass && i == 1) order.flags |= OF_UNLOAD; + if (!is_pass && i == 1) order.flags |= OFB_UNLOAD; if (_players_ai[p->index].num_want_fullload != 0 && (is_pass || i == 0)) - order.flags |= OF_FULL_LOAD; + order.flags |= OFB_FULL_LOAD; DoCommand(0, loco_id + (i << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); } diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp index f7c488b49..01792f527 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -1187,7 +1187,7 @@ static void AiNew_State_GiveOrders(Player *p) if (_patches.gotodepot) { idx = 0; order.type = OT_GOTO_DEPOT; - order.flags = OF_UNLOAD; + order.flags = OFB_UNLOAD; order.dest = GetDepotByTile(_players_ainew[p->index].depot_tile)->index; AI_DoCommand(0, _players_ainew[p->index].veh_id + (idx << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); } @@ -1197,7 +1197,7 @@ static void AiNew_State_GiveOrders(Player *p) order.flags = 0; order.dest = GetStationIndex(_players_ainew[p->index].to_tile); if (_players_ainew[p->index].tbt == AI_TRUCK && _players_ainew[p->index].to_deliver) - order.flags |= OF_FULL_LOAD; + order.flags |= OFB_FULL_LOAD; AI_DoCommand(0, _players_ainew[p->index].veh_id + (idx << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); idx = 0; @@ -1205,7 +1205,7 @@ static void AiNew_State_GiveOrders(Player *p) order.flags = 0; order.dest = GetStationIndex(_players_ainew[p->index].from_tile); if (_players_ainew[p->index].tbt == AI_TRUCK && _players_ainew[p->index].from_deliver) - order.flags |= OF_FULL_LOAD; + order.flags |= OFB_FULL_LOAD; AI_DoCommand(0, _players_ainew[p->index].veh_id + (idx << 16), PackOrder(&order), DC_EXEC, CMD_INSERT_ORDER); // Start the engines! |