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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/economy.cpp
#	src/linkgraph/refresh.cpp
#	src/order_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_base.h
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2022-03-04 18:17:44 +00:00
parent 1e1b48323a 0d8fbf647b
commit e5a421b65a
37 changed files with 296 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/order_backup.cpp
View File

@@ -67,9 +67,9 @@ OrderBackup::OrderBackup(const Vehicle *v, uint32 user)
tail = &copy->next;
}
if (v->orders.list != nullptr && HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH)) {
if (v->orders != nullptr && HasBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH)) {
SetBit(this->vehicle_flags, VF_SCHEDULED_DISPATCH);
this->dispatch_schedules = v->orders.list->GetScheduledDispatchScheduleSet();
this->dispatch_schedules = v->orders->GetScheduledDispatchScheduleSet();
}
}
@@ -86,12 +86,12 @@ void OrderBackup::DoRestore(Vehicle *v)
if (this->clone != nullptr) {
DoCommand(0, v->index | CO_SHARE << 30, this->clone->index, DC_EXEC, CMD_CLONE_ORDER);
} else if (this->orders != nullptr && OrderList::CanAllocateItem()) {
v->orders.list = new OrderList(this->orders, v);
v->orders = new OrderList(this->orders, v);
this->orders = nullptr;
if (HasBit(this->vehicle_flags, VF_SCHEDULED_DISPATCH)) {
SetBit(v->vehicle_flags, VF_SCHEDULED_DISPATCH);
v->orders.list->GetScheduledDispatchScheduleSet() = std::move(this->dispatch_schedules);
v->orders->GetScheduledDispatchScheduleSet() = std::move(this->dispatch_schedules);
}
/* Make sure buoys/oil rigs are updated in the station list. */