diff options
author | rubidium <rubidium@openttd.org> | 2008-04-07 19:18:56 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-04-07 19:18:56 +0000 |
commit | f1cd7ef5ee9d0862622d53a4c348d6f9debd500e (patch) | |
tree | 107ad3411123e54f1869835417c772620cee3502 /src/order_gui.cpp | |
parent | 45165fe075f9eb4234ea876fc5695a422eced66e (diff) | |
download | openttd-f1cd7ef5ee9d0862622d53a4c348d6f9debd500e.tar.xz |
(svn r12615) -Codechange: rename some enums related to depot orders to make it more clear that they are no loading/unloading flags. Also add more type strictness.
Diffstat (limited to 'src/order_gui.cpp')
-rw-r--r-- | src/order_gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 871bd5e3f..633189850 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -222,7 +222,7 @@ static void DrawOrdersWindow(Window *w) } } - if (order->GetDepotOrderType() & OFB_SERVICE_IF_NEEDED) s++; /* service at */ + if (order->GetDepotOrderType() & ODTFB_SERVICE) s++; /* service at */ SetDParam(1, s); if (order->IsRefit()) { @@ -270,7 +270,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) case MP_RAILWAY: if (v->type == VEH_TRAIN && IsTileOwner(tile, _local_player)) { if (IsRailDepot(tile)) { - order.MakeGoToDepot(GetDepotByTile(tile)->index, true); + order.MakeGoToDepot(GetDepotByTile(tile)->index, ODTFB_PART_OF_ORDERS); return order; } } @@ -278,7 +278,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) case MP_ROAD: if (IsRoadDepot(tile) && v->type == VEH_ROAD && IsTileOwner(tile, _local_player)) { - order.MakeGoToDepot(GetDepotByTile(tile)->index, true); + order.MakeGoToDepot(GetDepotByTile(tile)->index, ODTFB_PART_OF_ORDERS); return order; } break; @@ -286,7 +286,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) case MP_STATION: if (v->type != VEH_AIRCRAFT) break; if (IsHangar(tile) && IsTileOwner(tile, _local_player)) { - order.MakeGoToDepot(GetStationIndex(tile), true); + order.MakeGoToDepot(GetStationIndex(tile), ODTFB_PART_OF_ORDERS); return order; } break; @@ -297,7 +297,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile) IsTileOwner(tile, _local_player)) { TileIndex tile2 = GetOtherShipDepotTile(tile); - order.MakeGoToDepot(GetDepotByTile(tile < tile2 ? tile : tile2)->index, true); + order.MakeGoToDepot(GetDepotByTile(tile < tile2 ? tile : tile2)->index, ODTFB_PART_OF_ORDERS); return order; } |