From 9527bad3a7fe4098ff2ebe2173e2d7b14d1aaaa7 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 29 Jul 2012 16:48:00 +0000 Subject: (svn r24446) -Add [FS#5199]: Store more consist properties in order backups. --- src/base_consist.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/base_consist.cpp') diff --git a/src/base_consist.cpp b/src/base_consist.cpp index 93b97e10e..005c88672 100644 --- a/src/base_consist.cpp +++ b/src/base_consist.cpp @@ -11,6 +11,7 @@ #include "stdafx.h" #include "base_consist.h" +#include "vehicle_base.h" BaseConsist::~BaseConsist() { @@ -28,6 +29,16 @@ void BaseConsist::CopyConsistPropertiesFrom(const BaseConsist *src) free(this->name); this->name = src->name != NULL ? strdup(src->name) : NULL; + this->current_order_time = src->current_order_time; + this->lateness_counter = src->lateness_counter; + this->timetable_start = src->timetable_start; + this->service_interval = src->service_interval; + this->cur_real_order_index = src->cur_real_order_index; + this->cur_implicit_order_index = src->cur_implicit_order_index; + + if (HasBit(src->vehicle_flags, VF_TIMETABLE_STARTED)) SetBit(this->vehicle_flags, VF_TIMETABLE_STARTED); + if (HasBit(src->vehicle_flags, VF_AUTOFILL_TIMETABLE)) SetBit(this->vehicle_flags, VF_AUTOFILL_TIMETABLE); + if (HasBit(src->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME)) SetBit(this->vehicle_flags, VF_AUTOFILL_PRES_WAIT_TIME); } -- cgit v1.2.3-54-g00ecf