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 02e9d31797e2faf6737288ba68c38829b98a0bdb..285a15a27fb83794bcffa9406c144b416e1d0079 100644 (file)
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -222,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
@@ -510,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;