mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Remove OrderTypeByte

pull/7551/head
Charles Pigott 2019-04-22 08:16:45 +01:00 committed by PeterN
parent 96097b34a5
commit 60e31c7cfa
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/order_cmd.cpp
View File

@ -1465,7 +1465,7 @@ CommandCost CmdModifyOrder(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
* whether we are not going to a depot as there are three * whether we are not going to a depot as there are three
* cases where the full load flag can be active and only * cases where the full load flag can be active and only
* one case where the flag is used for depot orders. In the * one case where the flag is used for depot orders. In the
* other cases for the OrderTypeByte the flags are not used, * other cases for the OrderType the flags are not used,
* so do not care and those orders should not be active * so do not care and those orders should not be active
* when this function is called. * when this function is called.
*/ */

10
src/order_type.h
View File

@ -33,8 +33,8 @@ static const OrderID INVALID_ORDER = 0xFFFFFF;
*/ */
static const uint IMPLICIT_ORDER_ONLY_CAP = 32; static const uint IMPLICIT_ORDER_ONLY_CAP = 32;
/** Order types */ /** Order types. It needs to be 8bits, because we save and load it as such */
enum OrderType { enum OrderType : byte {
OT_BEGIN = 0, OT_BEGIN = 0,
OT_NOTHING = 0, OT_NOTHING = 0,
OT_GOTO_STATION = 1, OT_GOTO_STATION = 1,
@ -44,14 +44,10 @@ enum OrderType {
OT_DUMMY = 5, OT_DUMMY = 5,
OT_GOTO_WAYPOINT = 6, OT_GOTO_WAYPOINT = 6,
OT_CONDITIONAL = 7, OT_CONDITIONAL = 7,
OT_IMPLICIT = 8, OT_IMPLICIT = 8,
OT_END OT_END
}; };
/** It needs to be 8bits, because we save and load it as such */
typedef SimpleTinyEnumT<OrderType, byte> OrderTypeByte;
/** /**
* Flags related to the unloading order. * Flags related to the unloading order.
*/ */