Use signal_advanced for train speed measurement and vehicle placement

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

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index ba07e94e76e96baa746edbab655b7b34b9233414..8e8726955c42cfddee688a7a0a1c775355857748 100644 (file)
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -337,7 +337,7 @@ void BlockAllocator::advance_front(const Block *block, bool inclusive)
        // Update cur_blocks_end first to keep things consistent.
        cur_blocks_end = end;
        for(; i!=end; ++i)
-               signal_advanced.emit(**i);
+               signal_advanced.emit(**i, (*i)->get_sensor());
 }
 
 void BlockAllocator::advance_front(const Sensor *sensor)
@@ -488,6 +488,8 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
        {
                if(&sensor==next_sensor)
                {
+                       if(is_block_current(*block))
+                               signal_advanced.emit(*block, &sensor);
                        update_next_sensor(next_sensor);
                        advance_front(next_sensor);