Redesign the train activation system

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

diff --git a/source/libr2c2/trainstatus.cpp b/source/libr2c2/trainstatus.cpp
index a5f187faa26667294a710b655fcc6ec5999071a9..10651d01c210ccba7d8f805b2bcfde2f9524cf25 100644 (file)
--- a/source/libr2c2/trainstatus.cpp
+++ b/source/libr2c2/trainstatus.cpp
@@ -16,7 +16,7 @@ TrainStatus::TrainStatus(Train &t):
        check();
 }
 
-void TrainStatus::tick(const Time::TimeStamp &, const Time::TimeDelta &)
+void TrainStatus::tick(const Time::TimeDelta &)
 {
        check();
 }
@@ -25,7 +25,7 @@ void TrainStatus::check()
 {
        float scale = train.get_layout().get_catalogue().get_scale();
        int s = static_cast<int>(train.get_quantized_speed()*3.6/scale+0.5);
-       if(s==0 && train.is_active())
+       if(s==0 && train.get_block_allocator().is_active())
                s = -1;
 
        if(s!=speed)