diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index 0da604efd9..4ab6f45e71 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -317,6 +317,7 @@
+
@@ -439,6 +440,7 @@
+
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index d1e9d79719..34a8b4d000 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -180,6 +180,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -546,6 +549,9 @@
Header Files
+
+ Header Files
+
Header Files
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 310b64dc86..c6e3e595f7 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -538,6 +538,10 @@
RelativePath=".\..\src\fontcache.cpp"
>
+
+
@@ -1030,6 +1034,10 @@
RelativePath=".\..\src\fontcache.h"
>
+
+
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 4be6956f66..b5155a4692 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -535,6 +535,10 @@
RelativePath=".\..\src\fontcache.cpp"
>
+
+
@@ -1027,6 +1031,10 @@
RelativePath=".\..\src\fontcache.h"
>
+
+
diff --git a/source.list b/source.list
index bd6dd04cef..83dc19e832 100644
--- a/source.list
+++ b/source.list
@@ -25,6 +25,7 @@ engine.cpp
fileio.cpp
fios.cpp
fontcache.cpp
+base_consist.cpp
gamelog.cpp
genworld.cpp
gfx.cpp
@@ -172,6 +173,7 @@ fileio_func.h
fileio_type.h
fios.h
fontcache.h
+base_consist.h
gamelog.h
gamelog_internal.h
genworld.h
diff --git a/src/base_consist.cpp b/src/base_consist.cpp
new file mode 100644
index 0000000000..def120fe1c
--- /dev/null
+++ b/src/base_consist.cpp
@@ -0,0 +1,25 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
+ */
+
+/** @file base_consist.cpp Properties for front vehicles/consists. */
+
+#include "stdafx.h"
+#include "base_consist.h"
+
+/**
+ * Copy properties of other BaseConsist.
+ * @param src Source for copying
+ */
+void BaseConsist::CopyConsistPropertiesFrom(const BaseConsist *src)
+{
+ if (this == src) return;
+
+ this->service_interval = src->service_interval;
+ this->cur_real_order_index = src->cur_real_order_index;
+}
diff --git a/src/base_consist.h b/src/base_consist.h
new file mode 100644
index 0000000000..3c1366a6d3
--- /dev/null
+++ b/src/base_consist.h
@@ -0,0 +1,26 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
+ */
+
+/** @file base_consist.h Properties for front vehicles/consists. */
+
+#ifndef BASE_CONSIST_H
+#define BASE_CONSIST_H
+
+#include "order_type.h"
+#include "date_type.h"
+
+/** Various front vehicle properties that are preserved when autoreplacing, using order-backup or switching front engines within a consist. */
+struct BaseConsist {
+ Date service_interval; ///< The interval for (automatic) servicing; either in days or %.
+ VehicleOrderID cur_real_order_index;///< The index to the current real (non-implicit) order
+
+ void CopyConsistPropertiesFrom(const BaseConsist *src);
+};
+
+#endif /* BASE_CONSIST_H */
diff --git a/src/vehicle_base.h b/src/vehicle_base.h
index fa06519e08..545b3404c8 100644
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -21,6 +21,7 @@
#include "order_func.h"
#include "transport_type.h"
#include "group_type.h"
+#include "base_consist.h"
/** Vehicle status bits in #Vehicle::vehstatus. */
enum VehStatus {
@@ -121,7 +122,7 @@ extern void FixOldVehicles();
struct GRFFile;
/** %Vehicle data structure. */
-struct Vehicle : VehiclePool::PoolItem<&_vehicle_pool>, BaseVehicle {
+struct Vehicle : VehiclePool::PoolItem<&_vehicle_pool>, BaseVehicle, BaseConsist {
private:
Vehicle *next; ///< pointer to the next vehicle in the chain
Vehicle *previous; ///< NOSAVE: pointer to the previous vehicle in the chain
@@ -173,7 +174,6 @@ public:
Date age; ///< Age in days
Date max_age; ///< Maximum age
Date date_of_last_service; ///< Last date the vehicle had a service at a depot.
- Date service_interval; ///< The interval for (automatic) servicing; either in days or %.
uint16 reliability; ///< Reliability.
uint16 reliability_spd_dec; ///< Reliability decrease speed.
byte breakdown_ctr; ///< Counter for managing breakdown events. @see Vehicle::HandleBreakdown
@@ -229,7 +229,6 @@ public:
byte vehstatus; ///< Status
Order current_order; ///< The current order (+ status, like: loading)
- VehicleOrderID cur_real_order_index;///< The index to the current real (non-implicit) order
VehicleOrderID cur_implicit_order_index;///< The index to the current implicit order
union {
@@ -597,9 +596,10 @@ public:
*/
inline void CopyVehicleConfigAndStatistics(const Vehicle *src)
{
+ this->CopyConsistPropertiesFrom(src);
+
this->unitnumber = src->unitnumber;
- this->cur_real_order_index = src->cur_real_order_index;
this->cur_implicit_order_index = src->cur_implicit_order_index;
this->current_order = src->current_order;
this->dest_tile = src->dest_tile;
@@ -614,8 +614,6 @@ public:
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);
-
- this->service_interval = src->service_interval;
}