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

Add xdata2 field to OrderExtraInfo

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/order_cmd.cpp
View File

@@ -407,7 +407,9 @@ void Order::AssignOrder(const Order &other)
this->travel_time = other.travel_time;
this->max_speed = other.max_speed;
if (other.extra != nullptr && (this->GetUnloadType() == OUFB_CARGO_TYPE_UNLOAD || this->GetLoadType() == OLFB_CARGO_TYPE_LOAD || other.extra->xdata != 0 || other.extra->xflags != 0 || other.extra->dispatch_index != 0)) {
if (other.extra != nullptr && (this->GetUnloadType() == OUFB_CARGO_TYPE_UNLOAD || this->GetLoadType() == OLFB_CARGO_TYPE_LOAD
|| (this->IsType(OT_LABEL) && this->GetLabelSubType() == OLST_TEXT)
|| other.extra->xdata != 0 || other.extra->xdata2 != 0 || other.extra->xflags != 0 || other.extra->dispatch_index != 0)) {
this->AllocExtraInfo();
*(this->extra) = *(other.extra);
} else {