Make vehicles aware of which train they are in

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

diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp
index ca2aa42316a16d8da5b5eea506e5cd87b8c79e48..a9d5135e9d7806955148e62b8558bd854339372a 100644 (file)
--- a/source/libr2c2/vehicle.cpp
+++ b/source/libr2c2/vehicle.cpp
@@ -16,6 +16,7 @@ namespace R2C2 {
 Vehicle::Vehicle(Layout &l, const VehicleType &t):
        Object(l),
        type(t),
+       train(0),
        next(0),
        prev(0),
        front_sensor(0),
@@ -25,7 +26,7 @@ Vehicle::Vehicle(Layout &l, const VehicleType &t):
        bogies.assign(type.get_bogies().begin(), type.get_bogies().end());
        rods.assign(type.get_rods().begin(), type.get_rods().end());
 
-       layout.add_vehicle(*this);
+       layout.add(*this);
 }
 
 Vehicle::~Vehicle()
@@ -34,7 +35,7 @@ Vehicle::~Vehicle()
                detach_back();
        if(prev)
                detach_front();
-       layout.remove_vehicle(*this);
+       layout.remove(*this);
 }
 
 Vehicle *Vehicle::clone(Layout *to_layout) const
@@ -45,6 +46,11 @@ Vehicle *Vehicle::clone(Layout *to_layout) const
        return veh;
 }
 
+void Vehicle::set_train(Train *t)
+{
+       train = t;
+}
+
 void Vehicle::attach_back(Vehicle &veh)
 {
        if(next || veh.prev)
@@ -87,9 +93,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 +440,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 +454,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 +485,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();
 }