Adapt to changes in vector slicing and composing API

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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index f5823c44550576f48521f971bf22b7985d15d1f2..fc93cf66b6076555a76129c745b1900f6dd78eff 100644 (file)
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -171,6 +171,7 @@ void Engineer::tick()
        new_trains.clear();
 
        layout.tick();
+       layout_3d.tick();
        event_disp.tick(Time::zero);
 
        for(list<TrainView *>::iterator i=train_views.begin(); i!=train_views.end(); ++i)
@@ -305,9 +306,9 @@ 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)