Don't bother with creating intermediate steps for state updates

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index b6d2f07cb66203ded55f3471110f94a0270287c0..4186f471c43afcc7322071d53402aa690b7350c7 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -375,7 +375,7 @@ bool TrainRoutePlanner::TrainRoutingState::check_arrival()
                        }
                }
 
-       if(info->first_noncritical->has_track(*track))
+       if(info->first_noncritical->has_track(*next_track))
                critical = false;
 
        return false;
@@ -490,14 +490,8 @@ TrainRoutePlanner::RoutingStep::RoutingStep(const RoutingStep *p):
 void TrainRoutePlanner::RoutingStep::create_successors(list<RoutingStep> &new_steps) const
 {
        RoutingStep next(this);
-       if(next.update_states())
-       {
-               if(next.check_deadlocks())
-                       return;
-
-               new_steps.push_back(next);
+       if(next.update_states() && next.check_deadlocks())
                return;
-       }
 
        int train_index = find_next_train();
        if(train_index<0)