X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=99731c6f45c2068684144dd1e8352f8be7f92b22;hb=a7e320b46a7d4070613b3210c28e65f579750f37;hp=0de707b16d21c167a88b9f153ac4945c719c647a;hpb=54392d65e2053d1eacb4cfcc435f1013993f2973;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 0de707b..99731c6 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -157,6 +157,7 @@ void TrainRoutePlanner::create_routes(RoutingStep &goal)
 	{
 		i->route = new Route(i->train->get_layout());
 		i->route->set_name("Router");
+		i->route->set_temporary(true);
 	}
 
 	for(RoutingStep *i=&goal; i; i=i->prev)
@@ -223,37 +224,22 @@ TrainRoutePlanner::OccupiedTrack::~OccupiedTrack()
 TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
 	info(&inf),
 	occupied_tracks(0),
-	state(MOVING)
+	state(MOVING),
+	delay(info->router->get_departure_delay())
 {
 	const Vehicle *veh = &info->train->get_vehicle(0);
-	track = veh->get_track_iter();
 	// TODO margins
-	offset = veh->get_offset()+veh->get_type().get_length()/2;
+	TrackOffsetIter track_and_offs = veh->get_placement().get_position(VehiclePlacement::FRONT_BUFFER);
+	track = track_and_offs.track_iter();
+	offset = track_and_offs.offset();
 	path = track->get_active_path();
 
-	float path_length = track->get_type().get_path_length(path);
-	while(offset>path_length)
-	{
-		offset -= path_length;
-		track = track.next();
-		path = track->get_active_path();
-		path_length = track->get_type().get_path_length(path);
-	}
-
 	while(Vehicle *next = veh->get_link(1))
 		veh = next;
-	back_offset = veh->get_offset()-veh->get_type().get_length()/2;
-
-	TrackIter iter = veh->get_track_iter();
-	while(back_offset<0)
-	{
-		TrackIter prev = iter.flip().reverse();
-		if(!prev)
-			break;
-		iter = prev;
-		back_offset += iter->get_type().get_path_length(iter->get_active_path());
-	}
+	track_and_offs = veh->get_placement().get_position(VehiclePlacement::BACK_BUFFER);
+	back_offset = track_and_offs.offset();
 
+	TrackIter iter = track_and_offs.track_iter();
 	while(1)
 	{
 		occupied_tracks = new OccupiedTrack(*iter, iter->get_active_path(), occupied_tracks);
@@ -284,7 +270,7 @@ TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
 {
 	// TODO Consider the speed of the train
-	return (track->get_type().get_path_length(path)-offset)*Time::sec;
+	return (track->get_type().get_path_length(path)-offset)*Time::sec+delay;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const
@@ -343,11 +329,20 @@ void TrainRoutePlanner::RoutingStep::advance(const Time::TimeDelta &dt)
 {
 	time += dt;
 	for(vector<TrainRoutingState>::iterator i=trains.begin(); i!=trains.end(); ++i)
-		if(i->state==MOVING)
+	{
+		if(i->delay)
+		{
+			i->delay -= dt;
+			if(i->delay>Time::zero)
+				continue;
+			i->delay = Time::zero;
+		}
+		else if(i->state==MOVING)
 		{
 			float distance = dt/Time::sec;
 			i->advance(distance);
 		}
+	}
 }
 
 bool TrainRoutePlanner::RoutingStep::is_goal() const