X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=122b91a3bd195837f90455cc3da66289d37ea453;hb=68877070660f2806cc2a7f0ccb69153059ef6ce7;hp=3d8b9d4b7b42a3c7ee3c69c84a81407232107107;hpb=ecd7af790bd3ab7c7e768f68968379e1feea56a9;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 3d8b9d4..122b91a 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -1,3 +1,4 @@
+#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackiter.h"
@@ -67,6 +68,8 @@ void TrainRouter::use_planned_route()
 {
 	if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE)
 		return;
+	if(waypoints.empty())
+		return;
 
 	const list<Route *> &planned_routes = planner->get_routes_for(train);
 
@@ -118,7 +121,7 @@ void TrainRouter::route_changed()
 		if(!sequence_points.empty())
 		{
 			const SequencePoint &sp = sequence_points.front();
-			if(sp.block==fncb.block() && !sp.is_cleared())
+			if(sp.block==fncb.block() && sp.preceding_train)
 			{
 				arrival = WAITING_FOR_SEQUENCE;
 				sequence_check_pending = true;
@@ -225,24 +228,28 @@ void TrainRouter::message(const Message &msg)
 
 void TrainRouter::tick(const Time::TimeDelta &dt)
 {
-	if(delay)
-	{
-		delay -= dt;
-		if(delay<Time::zero)
-		{
-			duration = max(duration+delay, Time::zero);
-			delay = Time::zero;
-		}
-	}
-	else if(duration)
-		duration = max(duration-dt, Time::zero);
-
 	if(waypoints_changed && !planner)
 		start_planning(train.get_layout());
 
 	if(planner && planner->check()!=TrainRoutePlanner::PENDING)
 		apply_plan(train.get_layout(), *planner);
 
+	Layout &layout = train.get_layout();
+	if(!layout.get_driver().is_halted() && !layout.get_clock().is_stopped())
+	{
+		if(delay)
+		{
+			delay -= dt;
+			if(delay<Time::zero)
+			{
+				duration = max(duration+delay, Time::zero);
+				delay = Time::zero;
+			}
+		}
+		else if(duration)
+			duration = max(duration-dt, Time::zero);
+	}
+
 	if(sequence_check_pending)
 	{
 		if(sequence_points.front().is_cleared())
@@ -486,27 +493,25 @@ bool TrainRouter::create_lead_route()
 	return true;
 }
 
-bool TrainRouter::is_valid_for_track(const Route &route, const TrackIter &track) const
-{
-	if(!route.has_track(*track))
-		return false;
-	if(track->get_type().is_turnout() && route.get_turnout(track->get_turnout_address())<0 && route.has_track(*track.flip()))
-		return false;
-	return true;
-}
-
 bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &track)
 {
-	if(!is_valid_for_track(**route, track))
+	Track &prev_track = *track.flip();
+	unsigned taddr = (track->get_type().is_turnout() ? track->get_turnout_address() : 0);
+	for(unsigned i=0; route!=routes.end(); ++i)
 	{
-		++route;
-		if(route==routes.end())
-			return false;
-		if(!is_valid_for_track(**route, track))
+		bool in_route = (*route)->has_track(*track);
+		bool prev_in_route = (*route)->has_track(prev_track);
+		bool known_path = (!taddr || (*route)->get_turnout(taddr)>=0);
+
+		if(in_route && (known_path || !prev_in_route))
+			return true;
+		else if(i==0 || prev_in_route)
+			++route;
+		else
 			throw logic_error("internal error (routes are not continuous)");
 	}
 
-	return true;
+	return false;
 }
 
 void TrainRouter::get_routers(Layout &layout, vector<TrainRouter *> &routers)
@@ -539,6 +544,9 @@ void TrainRouter::start_planning(Layout &layout)
 
 void TrainRouter::apply_plan(Layout &layout, TrainRoutePlanner &planner)
 {
+	if(planner.get_result()==TrainRoutePlanner::FAILED)
+		layout.emergency(0, "Route planning failed");
+
 	vector<TrainRouter *> routers;
 	get_routers(layout, routers);