X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=9245774f605309d597591fa01e95eb60f8b20c38;hb=7f63edbdf0d3c08893bdd2341ec3e50fb1ccc6f8;hp=d1cb6ff4a3a9b8eca35c439edcf8db3258e6e17b;hpb=2fec8b40d8cd953e36362773e440e50cc4f94a91;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index d1cb6ff..9245774 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -62,6 +62,7 @@ bool TrainRouter::set_route(const Route *r)
 	routes.clear();
 	if(lead)
 		routes.push_back(lead);
+	// TODO Check if eclipsed by lead route
 	if(r)
 		routes.push_back(r);
 
@@ -180,6 +181,11 @@ void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
 	destination_changed = true;
 }
 
+void TrainRouter::set_trip_duration(const Time::TimeDelta &d)
+{
+	duration = d;
+}
+
 void TrainRouter::message(const Message &msg)
 {
 	if(msg.type=="set-route")
@@ -207,6 +213,8 @@ void TrainRouter::message(const Message &msg)
 	}
 	else if(msg.type=="set-departure-delay")
 		set_departure_delay(msg.value.value<Time::TimeDelta>());
+	else if(msg.type=="set-trip-duration")
+		set_trip_duration(msg.value.value<Time::TimeDelta>());
 }
 
 void TrainRouter::tick(const Time::TimeDelta &dt)
@@ -214,31 +222,48 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 	if(delay)
 	{
 		delay -= dt;
-		if(delay<=Time::zero)
+		if(delay<Time::zero)
+		{
+			duration = max(duration+delay, Time::zero);
 			delay = Time::zero;
+		}
 	}
+	else if(duration)
+		duration = max(duration-dt, Time::zero);
+
+	if(destination_changed && !planner)
+		start_planning(train.get_layout());
 
-	if(destination_changed)
+	if(planner && planner->check()!=TrainRoutePlanner::PENDING)
 	{
-		if(!planner)
-			start_planning(train.get_layout());
-		else if(planner->get_result()!=TrainRoutePlanner::PENDING)
+		destination_changed = false;
+		if(planner->get_result()==TrainRoutePlanner::COMPLETE)
 		{
-			destination_changed = false;
-			if(planner->get_result()==TrainRoutePlanner::COMPLETE)
+			const list<Route *> &planned_routes = planner->get_routes_for(train);
+
+			routes.clear();
+			Route *lead = create_lead_route(0, planned_routes.front());
+			routes.push_back(lead);
+
+			list<Route *>::const_iterator begin = planned_routes.begin();
+			for(; begin!=planned_routes.end(); ++begin)
 			{
-				const list<Route *> &planned_routes = planner->get_routes_for(train);
-				routes.clear();
-				routes.push_back(create_lead_route(0, planned_routes.front()));
-				routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
-				sequence_points = planner->get_sequence_for(train);
-				current_sequence = 0;
-				sequence_check_pending = false;
-
-				route_changed();
+				const Route::TrackSet &tracks = (*begin)->get_tracks();
+				bool eclipsed = true;
+				for(Route::TrackSet::const_iterator i=tracks.begin(); (eclipsed && i!=tracks.end()); ++i)
+					eclipsed = lead->has_track(**i);
+				if(!eclipsed)
+					break;
 			}
-			planner = 0;
+			routes.insert(routes.end(), begin, planned_routes.end());
+
+			sequence_points = planner->get_sequence_for(train);
+			current_sequence = 0;
+			sequence_check_pending = false;
+
+			route_changed();
 		}
+		planner = 0;
 	}
 
 	if(sequence_check_pending)
@@ -424,16 +449,16 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 		lead->set_temporary(true);
 	}
 
-	bool target_reached = false;
-	for(TrackIter i=train.get_block_allocator().first().track_iter(); i; i=i.next())
+	bool target_tracks = 0;
+	for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next())
 	{
 		if(i->get_block().get_train()!=&train)
 			break;
 		if(target)
 		{
 			if(target->has_track(*i))
-				target_reached = true;
-			else if(target_reached)
+				++target_tracks;
+			else if(target_tracks>0)
 				break;
 		}
 		lead->add_track(*i);
@@ -481,7 +506,7 @@ void TrainRouter::start_planning(Layout &layout)
 			router->planner = planner;
 		}
 
-	planner->plan();
+	planner->plan_async();
 }