Add a signal for advancing the rear end of the train

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

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index ed32193f3e1d116b65b557d9bb8619f82dc0bf41..5870a6d00474ccdcffa2478da7bb38ffc425e958 100644 (file)
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -253,26 +253,16 @@ void BlockAllocator::reserve_more()
                }
                else
                {
-                       const TrackType::Endpoint &entry_ep = track.endpoint();
                        unsigned path = track->get_active_path();
-                       if(!entry_ep.has_path(path))
+                       if(!track.endpoint().has_path(path))
                        {
-                               const TrackType::Endpoint &exit_ep = track.reverse().endpoint();
-                               if(entry_ep.has_common_paths(exit_ep))
+                               path = track->get_type().coerce_path(track.entry(), path);
+                               track->set_active_path(path);
+                               if(track->is_path_changing())
                                {
-                                       unsigned mask = entry_ep.paths&exit_ep.paths;
-                                       for(path=0; mask>1; ++path, mask>>=1) ;
-
-                                       track->set_active_path(path);
-                                       if(track->is_path_changing())
-                                       {
-                                               pending_block = &*block;
-                                               break;
-                                       }
-                               }
-                               else
-                                       // XXX Do something here
+                                       pending_block = &*block;
                                        break;
+                               }
                        }
                }
 
@@ -347,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)
-               train.signal_advanced.emit(**i);
+               signal_advanced.emit(**i, (*i)->get_sensor());
 }
 
 void BlockAllocator::advance_front(const Sensor *sensor)
@@ -407,6 +397,7 @@ void BlockAllocator::advance_back()
                                if(i!=end)
                                        ++end;
                                release_blocks_begin(end);
+                               signal_rear_advanced.emit(*last());
                        }
                        return;
                }
@@ -498,6 +489,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);