Basic support for beam gate sensors

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

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index 215d746a25e3442bbe0cad476028545d53569789..8d3381da20ecada6172781d064b9feba998e669a 100644 (file)
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -1,5 +1,6 @@
 #include <msp/core/maputils.h>
 #include <msp/core/raii.h>
+#include "beamgate.h"
 #include "blockallocator.h"
 #include "block.h"
 #include "catalogue.h"
@@ -247,7 +248,7 @@ void BlockAllocator::reserve_more()
        {
                update_next_sensor(0);
                // Immediately advance to just before the next sensor
-               advance_to(next_sensor ? next_sensor->get_block() : 0);
+               advance_front(next_sensor);
        }
 }
 
@@ -273,11 +274,18 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
        }
 }
 
-void BlockAllocator::advance_to(const Block *block)
+void BlockAllocator::advance_front(const Block *block, bool inclusive)
 {
        BlockList::iterator end;
        if(block)
-               end = find_if(cur_blocks_end, blocks.end(), BlockMatch(*block));
+       {
+               end = cur_blocks_end;
+               if(inclusive)
+                       --end;
+               end = find_if(end, blocks.end(), BlockMatch(*block));
+               if(inclusive && end!=blocks.end())
+                       ++end;
+       }
        else
                end = blocks.end();
 
@@ -289,6 +297,56 @@ void BlockAllocator::advance_to(const Block *block)
                train.signal_advanced.emit(**i);
 }
 
+void BlockAllocator::advance_front(const Sensor *sensor)
+{
+       if(sensor)
+               advance_front(sensor->get_block(), dynamic_cast<const BeamGate *>(sensor));
+       else
+               advance_front(0, false);
+}
+
+void BlockAllocator::advance_back()
+{
+       const Vehicle &veh = train.get_vehicle(train.get_controller().get_reverse() ? 0 : train.get_n_vehicles()-1);
+       const Block &veh_block = veh.get_track()->get_block();
+
+       /* Sensors aren't guaranteed to be detriggered in order.  Go through the
+       block list and locate the first sensor that's still active. */
+       Sensor *last_inactive = 0;
+       for(BlockList::iterator i=blocks.begin(); (i!=cur_blocks_end && i->block()!=&veh_block); ++i)
+       {
+               list<Sensor *> sensors;
+               if(Sensor *sensor = (*i)->get_sensor())
+                       sensors.push_back(sensor);
+
+               Block *block = &**i;
+               for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+                       if(!j->get_attachments().empty())
+                       {
+                               Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+                               for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+                                       if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+                                               sensors.push_back(gate);
+                       }
+
+               for(list<Sensor *>::const_iterator j=sensors.begin(); j!=sensors.end(); ++j)
+               {
+                       if((*j)->get_state())
+                       {
+                               if(last_inactive)
+                               {
+                                       if(dynamic_cast<BeamGate *>(*j))
+                                               ++i;
+                                       release_blocks_begin(i);
+                               }
+                               return;
+                       }
+                       else
+                               last_inactive = *j;
+               }
+       }
+}
+
 void BlockAllocator::release_blocks_begin(const BlockList::iterator &end)
 {
        for(BlockList::iterator i=blocks.begin(); i!=end; )
@@ -375,7 +433,7 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
                if(&sensor==next_sensor)
                {
                        update_next_sensor(next_sensor);
-                       advance_to(next_sensor ? next_sensor->get_block() : 0);
+                       advance_front(next_sensor);
 
                        if(active)
                                reserve_more();
@@ -384,47 +442,53 @@ void BlockAllocator::sensor_state_changed(Sensor &sensor, Sensor::State state)
                        train.get_layout().emergency("Sensor for "+train.get_name()+" triggered out of order");
        }
        else if(state==Sensor::INACTIVE)
-       {
-               const Vehicle &veh = train.get_vehicle(train.get_controller().get_reverse() ? 0 : train.get_n_vehicles()-1);
-               const Block &veh_block = veh.get_track()->get_block();
-
-               /* Sensors aren't guaranteed to be detriggered in order.  Go through the
-               block list and locate the first sensor that's still active. */
-               BlockList::iterator end = blocks.end();
-               for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
-               {
-                       // Avoid freeing blocks that still hold the train's vehicles
-                       if(&**i==&veh_block)
-                               break;
-
-                       if(Sensor *s = (*i)->get_sensor())
-                       {
-                               if(s->get_state()>=Sensor::MAYBE_INACTIVE)
-                                       break;
-                               else
-                                       end = i;
-                       }
-               }
-               
-               if(end!=blocks.end())
-                       // Free blocks up to the last inactive sensor
-                       release_blocks_begin(++end);
-       }
+               advance_back();
 }
 
 void BlockAllocator::update_next_sensor(Sensor *after)
 {
+       BeamGate *after_gate = dynamic_cast<BeamGate *>(after);
+
        BlockList::iterator i = cur_blocks_end;
        if(after)
+       {
+               if(after_gate)
+                       --i;
                i = find_if(i, blocks.end(), BlockMatch(*after->get_block()));
+       }
 
        for(; i!=blocks.end(); ++i)
+       {
                if(Sensor *sensor = (*i)->get_sensor())
-                       if(sensor!=next_sensor)
+               {
+                       if(!after_gate && sensor!=next_sensor)
                        {
                                next_sensor = sensor;
                                return;
                        }
+               }
+
+               Block *block = &**i;
+               for(TrackIter j=i->track_iter(); (j && &j->get_block()==block); j=j.next())
+                       if(!j->get_attachments().empty())
+                       {
+                               Track::AttachmentList attachments = j->get_attachments_ordered(j.entry());
+                               for(Track::AttachmentList::const_iterator k=attachments.begin(); k!=attachments.end(); ++k)
+                                       if(BeamGate *gate = dynamic_cast<BeamGate *>(*k))
+                                       {
+                                               if(after_gate)
+                                               {
+                                                       if(gate==after_gate)
+                                                               after_gate = 0;
+                                               }
+                                               else
+                                               {
+                                                       next_sensor = gate;
+                                                       return;
+                                               }
+                                       }
+                       }
+       }
 
        next_sensor = 0;
 }