X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=68533bc11520114862acfed734c50cd07c91010b;hb=74f8c3beba5a6947a523119e3f26cf745725b511;hp=f5823c44550576f48521f971bf22b7985d15d1f2;hpb=78d36019ec11d62d6fd016fcbe19f566d11771ff;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index f5823c4..68533bc 100644
--- 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,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)