cpp/openttd-patchpack/source Changeset - r23672:e547c22419a6

Changeset - r23672:e547c22419a6

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Charles Pigott - 5 years ago 2019-04-22 07:16:45
charlespigott@googlemail.com

Codechange: Remove OrderTypeByte

2 files changed with 4 insertions and 8 deletions:

src/order_cmd.cpp

src/order_type.h

0 comments (0 inline, 0 general)

src/order_cmd.cpp

➞

Show inline comments

@@ @@ -1465,7 +1465,7 @@ CommandCost CmdModifyOrder(TileIndex til @@
 			 * 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.
 			 */

src/order_type.h

➞

Show inline comments

@@ @@ -33,8 +33,8 @@ static const OrderID INVALID_ORDER = 0xF @@
  */
 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.
  */

0 comments (0 inline, 0 general)