Provide some telemetry values from ArduControl

[r2c2.git] / source / engineer / engineer.cpp

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index dedbf3cc5864e197cce7a77791e84162dc6e35cd..68533bc11520114862acfed734c50cd07c91010b 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -306,18 +306,21 @@ Object *Engineer::pick_object(const Vector &p)
        GL::Vector4 ray = main_view.get_camera().unproject(GL::Vector4(p.x, p.y, 0, 0));
 
        // XXX Do this better; make this function a template?
-       if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, Vector(ray))))
+       if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, ray.slice<3>(0))))
                return veh;
-       return layout.pick<Track>(Ray(start, Vector(ray)));
+       return layout.pick<Track>(Ray(start, ray.slice<3>(0)));
 }
 
 void Engineer::emergency(Block *block, const string &msg)
 {
        set_status(msg);
-       TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
-       tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
-       tch3d->set_layer(2);
-       emergencies.push_back(tch3d);
+       if(block)
+       {
+               TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
+               tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
+               tch3d->set_layer(2);
+               emergencies.push_back(tch3d);
+       }
 }
 
 void Engineer::halt_event(bool h)