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

Fix double-use of bits 3 and 7 in Order::flags.

Browse Source 
Use a different encoding for the cargo type load/unload bit in flags.
This commit is contained in:
Jonathan G Rennison
2016-09-08 00:12:27 +01:00
parent 6031cca2d7
commit bc04b07f2b
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/order_base.h
View File

@@ -160,7 +160,12 @@ public:
void SetRefit(CargoID cargo); void SetRefit(CargoID cargo);
/** How must the consist be loaded? */ /** How must the consist be loaded? */
inline OrderLoadFlags GetLoadType() const { return (OrderLoadFlags)GB(this->flags, 4, 4); } inline OrderLoadFlags GetLoadType() const
{
OrderLoadFlags type = (OrderLoadFlags)GB(this->flags, 4, 3);
if (type == OLFB_CARGO_TYPE_LOAD_ENCODING) type = OLFB_CARGO_TYPE_LOAD;
return type;
}
/** /**
* How must the consist be loaded for this type of cargo? * How must the consist be loaded for this type of cargo?
@@ -189,7 +194,12 @@ public:
} }
/** How must the consist be unloaded? */ /** How must the consist be unloaded? */
inline OrderUnloadFlags GetUnloadType() const { return (OrderUnloadFlags)GB(this->flags, 0, 4); } inline OrderUnloadFlags GetUnloadType() const
{
OrderUnloadFlags type = (OrderUnloadFlags)GB(this->flags, 0, 3);
if (type == OUFB_CARGO_TYPE_UNLOAD_ENCODING) type = OUFB_CARGO_TYPE_UNLOAD;
return type;
}
/** /**
* How must the consist be unloaded for this type of cargo? * How must the consist be unloaded for this type of cargo?
@@ -249,7 +259,11 @@ public:
inline uint16 GetConditionValue() const { return GB(this->dest, 0, 11); } inline uint16 GetConditionValue() const { return GB(this->dest, 0, 11); }
/** Set how the consist must be loaded. */ /** Set how the consist must be loaded. */
inline void SetLoadType(OrderLoadFlags load_type) { SB(this->flags, 4, 4, load_type); } inline void SetLoadType(OrderLoadFlags load_type)
{
if (load_type == OLFB_CARGO_TYPE_LOAD) load_type = OLFB_CARGO_TYPE_LOAD_ENCODING;
SB(this->flags, 4, 3, load_type);
}
/** /**
* Set how the consist must be loaded for this type of cargo. * Set how the consist must be loaded for this type of cargo.
@@ -265,7 +279,11 @@ public:
} }
/** Set how the consist must be unloaded. */ /** Set how the consist must be unloaded. */
inline void SetUnloadType(OrderUnloadFlags unload_type) { SB(this->flags, 0, 4, unload_type); } inline void SetUnloadType(OrderUnloadFlags unload_type)
{
if (unload_type == OUFB_CARGO_TYPE_UNLOAD) unload_type = OUFB_CARGO_TYPE_UNLOAD_ENCODING;
SB(this->flags, 0, 3, unload_type);
}
/** /**
* Set how the consist must be unloaded for this type of cargo. * Set how the consist must be unloaded for this type of cargo.

4
src/order_type.h
View File

@@ -61,6 +61,7 @@ enum OrderUnloadFlags {
OUFB_TRANSFER = 1 << 1, ///< Transfer all cargo onto the platform. OUFB_TRANSFER = 1 << 1, ///< Transfer all cargo onto the platform.
OUFB_NO_UNLOAD = 1 << 2, ///< Totally no unloading will be done. OUFB_NO_UNLOAD = 1 << 2, ///< Totally no unloading will be done.
OUFB_CARGO_TYPE_UNLOAD = 1 << 3, ///< Unload actions are defined per cargo type. OUFB_CARGO_TYPE_UNLOAD = 1 << 3, ///< Unload actions are defined per cargo type.
OUFB_CARGO_TYPE_UNLOAD_ENCODING = (1 << 0) | (1 << 2), ///< Raw encoding of OUFB_CARGO_TYPE_UNLOAD
}; };
/** /**
@@ -71,7 +72,8 @@ enum OrderLoadFlags {
OLFB_FULL_LOAD = 1 << 1, ///< Full load all cargoes of the consist. OLFB_FULL_LOAD = 1 << 1, ///< Full load all cargoes of the consist.
OLF_FULL_LOAD_ANY = 3, ///< Full load a single cargo of the consist. OLF_FULL_LOAD_ANY = 3, ///< Full load a single cargo of the consist.
OLFB_NO_LOAD = 4, ///< Do not load anything. OLFB_NO_LOAD = 4, ///< Do not load anything.
OLFB_CARGO_TYPE_LOAD = 1 << 3 ///< Load actions are defined per cargo type. OLFB_CARGO_TYPE_LOAD = 1 << 3, ///< Load actions are defined per cargo type.
OLFB_CARGO_TYPE_LOAD_ENCODING = (1 << 1) | 4, ///< Raw encoding of OLFB_CARGO_TYPE_LOAD
}; };
/** /**