X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=e75cec9cc6f9921f248dd76f89ecc8af80dc6067;hb=0443ca05cbd306487131f5f5bd3b91181ae4a733;hp=ce38c4e194e193de84a53595621a493dbef2c89b;hpb=1c072afdb1866ba397ee8e6155f5f68c6c7ab4da;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index ce38c4e..e75cec9 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -226,34 +226,19 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
 	state(MOVING)
 {
 	const Vehicle *veh = &info->train->get_vehicle(0);
-	track = TrackIter(veh->get_track(), veh->get_entry());
 	// TODO margins
-	offset = veh->get_offset()+veh->get_type().get_length()/2;
+	float half_length = veh->get_type().get_length()/2;
+	TrackOffsetIter track_and_offs = veh->get_track_iter().advance(half_length);
+	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(), veh->get_entry());
-	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_track_iter().advance(-half_length);
+	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);