Display the total length of selected tracks in status bar

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

diff --git a/source/libmarklin/vehicle.cpp b/source/libmarklin/vehicle.cpp
index d81848076c5984a26928873a49b13023785817d1..5a26f9294b665c8a5178696e482f78a8489f17dd 100644 (file)
--- a/source/libmarklin/vehicle.cpp
+++ b/source/libmarklin/vehicle.cpp
@@ -48,6 +48,9 @@ void Vehicle::attach_back(Vehicle &veh)
 
        next = &veh;
        veh.prev = this;
+
+       if(track_pos.track)
+               propagate_backward();
 }
 
 void Vehicle::attach_front(Vehicle &veh)
@@ -55,8 +58,11 @@ void Vehicle::attach_front(Vehicle &veh)
        if(prev || veh.next)
                throw InvalidState("Already attached");
 
-       next = &veh;
-       veh.prev = this;
+       prev = &veh;
+       veh.next = this;
+
+       if(prev->get_track())
+               prev->propagate_backward();
 }
 
 void Vehicle::detach_back()
@@ -77,9 +83,9 @@ void Vehicle::detach_front()
        prev = 0;
 }
 
-void Vehicle::place(Track *t, unsigned e, float o, PlaceMode m)
+void Vehicle::place(Track &t, unsigned e, float o, PlaceMode m)
 {
-       track_pos = TrackPosition(t, e, o);
+       track_pos = TrackPosition(&t, e, o);
 
        if(m==FRONT_AXLE)
                track_pos.advance(-type.get_front_axle_offset());
@@ -94,6 +100,19 @@ void Vehicle::place(Track *t, unsigned e, float o, PlaceMode m)
        propagate_position();
 }
 
+void Vehicle::unplace()
+{
+       if(!track_pos.track)
+               return;
+
+       track_pos = TrackPosition();
+
+       if(prev)
+               prev->unplace();
+       if(next)
+               next->unplace();
+}
+
 void Vehicle::advance(float d)
 {
        track_pos.advance(d);
@@ -150,6 +169,7 @@ void Vehicle::update_position()
                check_sensor(type.get_back_axle_offset(), back_sensor);
 
        position = tp.pos;
+       position.z += layout.get_catalogue().get_rail_elevation();
        direction = tp.dir;
 }
 
@@ -207,6 +227,8 @@ void Vehicle::check_sensor(float offset, unsigned &sensor)
        {
                /* Sensor ID under axle has changed.  Deduce movement direction by using
                the sensor ID under the midpoint of the vehicle. */
+               /* XXX This depends on the simulation running fast enough.  Something
+               more robust would be preferable. */
                unsigned old = sensor;
                sensor = s;
                unsigned mid = track_pos.track->get_sensor_id();
@@ -214,7 +236,6 @@ void Vehicle::check_sensor(float offset, unsigned &sensor)
                if(s && s!=mid)
                        /* There's a sensor and it's different from mid.  We've just entered
                        that sensor. */
-                       // XXX The Train will reset the vehicles to the start of the sensor, which is somewhat undesirable
                        layout.get_driver().set_sensor(sensor, true);
                if(old && old!=mid)
                        /* A sensor was under the axle and it was different from mid.  We've