summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2019-04-22 08:16:45 +0100
committerPeterN <peter@fuzzle.org>2019-04-29 17:40:22 +0100
commit60e31c7cfa2a79afa37a0f2e76b592920e5388fe (patch)
treeef0008c67d51920ecbacdcb22c38ebe928f11bac
parent96097b34a57feb7547c789b352e9b650fb2a9fea (diff)
downloadopenttd-60e31c7cfa2a79afa37a0f2e76b592920e5388fe.tar.xz
Codechange: Remove OrderTypeByte
-rw-r--r--src/order_cmd.cpp2
-rw-r--r--src/order_type.h10
2 files changed, 4 insertions, 8 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index 1a9d648c6..26b999af7 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -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
* cases where the full load flag can be active and only
* 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
* when this function is called.
*/
diff --git a/src/order_type.h b/src/order_type.h
index b1e0fad53..c150bc273 100644
--- a/src/order_type.h
+++ b/src/order_type.h
@@ -33,8 +33,8 @@ static const OrderID INVALID_ORDER = 0xFFFFFF;
*/
static const uint IMPLICIT_ORDER_ONLY_CAP = 32;
-/** Order types */
-enum OrderType {
+/** Order types. It needs to be 8bits, because we save and load it as such */
+enum OrderType : byte {
OT_BEGIN = 0,
OT_NOTHING = 0,
OT_GOTO_STATION = 1,
@@ -44,14 +44,10 @@ enum OrderType {
OT_DUMMY = 5,
OT_GOTO_WAYPOINT = 6,
OT_CONDITIONAL = 7,
- OT_IMPLICIT = 8,
+ OT_IMPLICIT = 8,
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.
*/