Properly detect blocks as critical when a train is not moving

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

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index b5f600e09e3a58a9744cbef5e7844cf57252aa78..285a15a27fb83794bcffa9406c144b416e1d0079 100644 (file)
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -6,6 +6,7 @@
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
 #include "aicontrol.h"
+#include "beamgate.h"
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
@@ -221,7 +222,7 @@ void Train::stop_at(Block *block)
 
 bool Train::is_block_critical(const Block &block) const
 {
-       return get_reserved_distance_until(&block)<controller->get_braking_distance()*1.3;
+       return get_reserved_distance_until(&block)<=controller->get_braking_distance()*1.3;
 }
 
 BlockIter Train::get_first_noncritical_block() const
@@ -475,6 +476,25 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state)
                                vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE);
                }
        }
+       else if(BeamGate *gate = dynamic_cast<BeamGate *>(&sensor))
+       {
+               if(!advancing && vehicles.front()->get_track())
+               {
+                       TrackIter track = allocator.iter_for(*block).track_iter();
+                       for(; (track && &track->get_block()==block); track=track.next())
+                               if(track.track()==gate->get_track())
+                               {
+                                       if(reverse)
+                                               track = track.reverse();
+                                       float offset = gate->get_offset_from_endpoint(track.entry());
+                                       if(reverse)
+                                               vehicles.back()->place(track, offset, Vehicle::BACK_BUFFER);
+                                       else
+                                               vehicles.front()->place(track, offset, Vehicle::FRONT_BUFFER);
+                                       break;
+                               }
+               }
+       }
 }
 
 void Train::halt_event(bool h)
@@ -490,7 +510,7 @@ float Train::get_reserved_distance_until(const Block *until_block) const
 
        Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
 
-       TrackIter track = veh.get_track_iter();
+       TrackIter track = veh.get_track_iter().track_iter();
        if(!track)  // XXX Probably unnecessary
                return 0;