Simplify some interfaces by using track and block iterators

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

diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp
index ca2aa42316a16d8da5b5eea506e5cd87b8c79e48..1c4a5b0f441ec9d5e6b40f711cc54afd176cbf08 100644 (file)
--- a/source/libr2c2/vehicle.cpp
+++ b/source/libr2c2/vehicle.cpp
@@ -87,9 +87,12 @@ void Vehicle::detach_front()
        prev = 0;
 }
 
-void Vehicle::place(Track &t, unsigned e, float o, PlaceMode m)
+void Vehicle::place(const TrackIter &t, float o, PlaceMode m)
 {
-       track_pos = TrackPosition(&t, e, o);
+       if(!t)
+               throw invalid_argument("Vehicle::place");
+
+       track_pos = TrackPosition(t, o);
 
        if(m==FRONT_AXLE)
                track_pos.advance(-type.get_front_axle_offset());
@@ -431,14 +434,11 @@ Vehicle::Rod::Rod(const VehicleType::Rod &t):
 
 
 Vehicle::TrackPosition::TrackPosition():
-       track(0),
-       ep(0),
        offs(0)
 { }
 
-Vehicle::TrackPosition::TrackPosition(Track *t, unsigned e, float o):
+Vehicle::TrackPosition::TrackPosition(const TrackIter &t, float o):
        track(t),
-       ep(e),
        offs(o)
 { }
 
@@ -448,33 +448,30 @@ void Vehicle::TrackPosition::advance(float d)
                return;
 
        offs += d;
-       TrackIter iter(track, ep);
-       while(iter)
+       while(track)
        {
-               float path_len = iter->get_type().get_path_length(iter->get_active_path());
+               float path_len = track->get_type().get_path_length(track->get_active_path());
 
                if(offs>path_len)
                {
                        offs -= path_len;
-                       iter = iter.next();
+                       track = track.next();
                }
                else
                        break;
        }
 
-       while(iter && offs<0)
+       while(track && offs<0)
        {
-               iter = iter.flip().reverse();
+               track = track.flip().reverse();
 
-               if(iter)
+               if(track)
                {
-                       float path_len = iter->get_type().get_path_length(iter->get_active_path());
+                       float path_len = track->get_type().get_path_length(track->get_active_path());
                        offs += path_len;
                }
        }
 
-       track = iter.track();
-       ep = iter.entry();
        if(!track)
                offs = 0;
 }
@@ -482,7 +479,7 @@ void Vehicle::TrackPosition::advance(float d)
 TrackPoint Vehicle::TrackPosition::get_point() const
 {
        if(track)
-               return track->get_point(ep, offs);
+               return track->get_point(track.entry(), offs);
        else
                return TrackPoint();
 }