Cosmetic tweaks

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index d9eedd2d4daccd0d33224548325c594859c7777a..7e179f39fa41b4f2c3390e55e4a5e02fbbd3bb55 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -363,7 +363,7 @@ TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
 {
-       return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
+       return ((occupied_tracks->path_length-offset)/info->speed)*Time::sec+delay;
 }
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_pass(Track &trk) const
@@ -498,19 +498,31 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
 void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
 {
        float distance = occupied_tracks->path_length-offset;
+
        track = track.next(path);
        path = next_path;
        occupied_tracks = new OccupiedTrack(*track, path, occupied_tracks);
+
        advance(distance);
        offset = 0;
 }
 
+void TrainRoutePlanner::TrainRoutingState::set_path(unsigned p)
+{
+       path = p;
+       OccupiedTrack *next_occ = occupied_tracks->next;
+       if(!--occupied_tracks->refcount)
+               delete occupied_tracks;
+       occupied_tracks = new OccupiedTrack(*track, path, next_occ);
+       update_estimate();
+}
+
 void TrainRoutePlanner::TrainRoutingState::update_estimate()
 {
        TrackIter iter = track.reverse(path);
        remaining_estimate = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
        if(remaining_estimate>=0)
-               remaining_estimate += track->get_type().get_path_length(path)-offset;
+               remaining_estimate += occupied_tracks->path_length-offset;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_viable() const
@@ -604,8 +616,7 @@ void TrainRoutePlanner::RoutingStep::create_successor(RoutingStep &next, unsigne
 {
        TrainRoutingState &train = next.trains[train_index];
 
-       train.path = path;
-       train.update_estimate();
+       train.set_path(path);
        next.update_estimate();
        if(next.is_viable())
                new_steps.push_back(next);