Simplify some interfaces by using track and block iterators

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index ce38c4e194e193de84a53595621a493dbef2c89b..0de707b16d21c167a88b9f153ac4945c719c647a 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -226,7 +226,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
        state(MOVING)
 {
        const Vehicle *veh = &info->train->get_vehicle(0);
-       track = TrackIter(veh->get_track(), veh->get_entry());
+       track = veh->get_track_iter();
        // TODO margins
        offset = veh->get_offset()+veh->get_type().get_length()/2;
        path = track->get_active_path();
@@ -244,7 +244,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
                veh = next;
        back_offset = veh->get_offset()-veh->get_type().get_length()/2;
 
-       TrackIter iter(veh->get_track(), veh->get_entry());
+       TrackIter iter = veh->get_track_iter();
        while(back_offset<0)
        {
                TrackIter prev = iter.flip().reverse();