dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11866) -Codechange: swap OFB_* and OF_* so it conceptually in sync with other cases of *B_* vs *_* like VETSB_* and VETS_*.

Browse Source
This commit is contained in:
rubidium
2008-01-15 18:44:22 +00:00
parent ab7cb0804d
commit 576f8ad93e
16 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ai/default/default.cpp
View File

@@ -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);
}

6
src/ai/trolly/trolly.cpp
View File

@@ -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!