Merge branch 'tmj-dev' into milek-dev

2026-07-22 06:59:18 +02:00 · 2018-07-17 16:20:11 +02:00
parent 37bade720d 3751c8a0a8
commit 08cf801c4e
77 changed files with 2959 additions and 2171 deletions
--- a/station.h
+++ b/station.h
@@ -20,3 +20,10 @@ public:
    double
        update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform );
 };
+
+namespace simulation {
+
+extern basic_station Station; // temporary object, for station functionality tests
+
+} // simulation
+