Make the simulation independent of wall clock time

[r2c2.git] / source / libr2c2 / train.cpp

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index d1fb4ed8a81b9608bb82827ccbf5071a3b395251..8cfa2d0ee4817158b11086ea318bdeef2c50db83 100644 (file)
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -136,11 +136,11 @@ void Train::set_active(bool a)
        active = a;
        if(active)
        {
-               stop_timeout = Time::TimeStamp();
+               stop_timeout = Time::zero;
                allocator.reserve_more();
        }
        else
-               stop_timeout = Time::now()+2*Time::sec;
+               stop_timeout = 2*Time::sec;
 }
 
 void Train::set_function(unsigned func, bool state)
@@ -289,18 +289,24 @@ void Train::reserve_more()
        allocator.reserve_more();
 }
 
-void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
+void Train::tick(const Time::TimeDelta &dt)
 {
-       if(!active && stop_timeout && t>=stop_timeout)
+       if(!active && stop_timeout)
        {
-               allocator.release_noncurrent();
-               stop_timeout = Time::TimeStamp();
+               stop_timeout -= dt;
+               if(stop_timeout<=Time::zero)
+               {
+                       allocator.release_noncurrent();
+                       stop_timeout = Time::TimeDelta();
+               }
        }
 
+       travel_time += dt;
+
        Driver &driver = layout.get_driver();
 
        for(list<TrainAI *>::iterator i=ais.begin(); i!=ais.end(); ++i)
-               (*i)->tick(t, dt);
+               (*i)->tick(dt);
        controller->tick(dt);
        float speed = controller->get_speed();
        bool moving = speed>0;
@@ -449,7 +455,7 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
 
                        if(travel_distance>0)
                        {
-                               float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
+                               float travel_time_secs = travel_time/Time::sec;
 
                                if(travel_time_secs>=2)
                                        speed_quantizer->learn(current_speed_step, travel_distance/travel_time_secs, travel_time_secs);
@@ -457,7 +463,7 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
                }
 
                last_entry_block = allocator.iter_for(*block);
-               last_entry_time = Time::now();
+               travel_time = Time::zero;
                pure_speed = true;
                accurate_position = true;
                overshoot_dist = 0;