diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index d461269b1..aa64b1cf0 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include #include "hamulce.h" #include "scripting/ladderlogic.h" -#include "vehicle/odometer.h" +#include "vehicle/odometerreading.h" class cParser; /* diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 9987b66b3..128335d17 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "vehicle/horn.h" #include "vehicle/linebreaker.h" #include "vehicle/holdcoillever.h" +#include "vehicle/odometer.h" #include "utilities/Globals.h" #include "simulation/simulation.h" diff --git a/vehicle/odometer.h b/vehicle/odometer.h index 83396abfd..93685d281 100644 --- a/vehicle/odometer.h +++ b/vehicle/odometer.h @@ -15,38 +15,14 @@ http://mozilla.org/MPL/2.0/. #include #include +#include "vehicle/odometerreading.h" + // the odometer of a vehicle: the total distance it has run, kept between the sessions (eu07/maszyna#72). // the analog counters in the cab (distcounter:) and the python screens (state["odometer_total"]) show // this one state, instead of the counters starting from their .mmd offset and the screens each keeping // their own files namespace odometer { -// where the state of a vehicle came from -enum class origin { - saved, // the odometer store of the earlier sessions - legacy, // the file a python screen kept it in before - counter, // the offset of the cab's counter, which used to show it on top of the distance run in the session - guessed // counted from a made up state, which the cab's counter can still replace, also once it was saved -}; - -// odometer of one vehicle -struct reading { - double km{0.0}; // the state, km - double start{0.0}; // the state at the start of the session, km - origin source{origin::guessed}; - double guess{0.0}; // the made up state a guessed one counts from, km - - // sets the state the vehicle starts the session with - void begin(double Km, origin Source); - // replaces the made up state a guessed one counts from with the one the cab's counter showed at the start, - // the distance run on top of it kept, in this session and the earlier ones. a known state stays - void seed(double Km); - // counts the distance run, in metres either way - void run(double Metres); - // the vehicle has run in this session - bool moved() const; -}; - // the saved odometer states of the vehicles, km by vehicle name. the name is the one the scenario gives the vehicle // (the name of its node, TDynamicObject::name(), e.g. EU07-424), the only identity a vehicle has between the sessions: // the vehicles of the same name in any scenarios share one state, whatever their type, and a vehicle the scenario diff --git a/vehicle/odometerreading.h b/vehicle/odometerreading.h new file mode 100644 index 000000000..1b7d028da --- /dev/null +++ b/vehicle/odometerreading.h @@ -0,0 +1,42 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// the odometer of a vehicle (eu07/maszyna#72), the part the vehicle physics (TMoverParameters::Odometer) keeps: plain +// data, without the store and its files, which are in vehicle/odometer.h +namespace odometer { + +// where the state of a vehicle came from +enum class origin { + saved, // the odometer store of the earlier sessions + legacy, // the file a python screen kept it in before + counter, // the offset of the cab's counter, which used to show it on top of the distance run in the session + guessed // counted from a made up state, which the cab's counter can still replace, also once it was saved +}; + +// odometer of one vehicle +struct reading { + double km{0.0}; // the state, km + double start{0.0}; // the state at the start of the session, km + origin source{origin::guessed}; + double guess{0.0}; // the made up state a guessed one counts from, km + + // sets the state the vehicle starts the session with + void begin(double Km, origin Source); + // replaces the made up state a guessed one counts from with the one the cab's counter showed at the start, + // the distance run on top of it kept, in this session and the earlier ones. a known state stays + void seed(double Km); + // counts the distance run, in metres either way + void run(double Metres); + // the vehicle has run in this session + bool moved() const; +}; + +} // namespace odometer