Add xdata2 field to OrderExtraInfo

This commit is contained in:
Jonathan G Rennison
2023-08-27 10:03:37 +01:00
parent e377535ea6
commit c11be37fd9
4 changed files with 17 additions and 2 deletions

View File

@@ -75,6 +75,7 @@ void ClearOrderDestinationRefcountMap();
struct OrderExtraInfo {
uint8 cargo_type_flags[NUM_CARGO] = {}; ///< Load/unload types for each cargo type.
uint32 xdata = 0; ///< Extra arbitrary data
uint32 xdata2 = 0; ///< Extra arbitrary data
uint16 dispatch_index = 0; ///< Scheduled dispatch index + 1
uint8 xflags = 0; ///< Extra flags
uint8 colour = 0; ///< Order colour + 1
@@ -150,6 +151,17 @@ public:
return this->extra->xdata;
}
inline uint32 GetXData2() const
{
return this->extra != nullptr ? this->extra->xdata2 : 0;
}
inline uint32 &GetXData2Ref()
{
CheckExtraInfoAlloced();
return this->extra->xdata2;
}
Order *next; ///< Pointer to next order. If nullptr, end of list
Order() : flags(0), refit_cargo(CT_NO_REFIT), max_speed(UINT16_MAX) {}