X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=e5381bd090a2f3bbf0e7e1179f4821637401727e;hb=32316772d422223827833366a7ee2d0a76d76ff1;hp=365fee0d6333d02c65875c518fcb7fe1042bf9a5;hpb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 365fee0..e5381bd 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -37,6 +37,7 @@ Engineer::Engineer(int argc, char **argv):
 	window(options.screen_w, options.screen_h, options.fullscreen),
 	keyboard(window),
 	mouse(window),
+	ui_res("r2c2.res"),
 	layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))),
 	layout_3d(layout),
 	server(0),
@@ -51,7 +52,6 @@ Engineer::Engineer(int argc, char **argv):
 	window.set_title("Railroad Engineer");
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0));
 
-	DataFile::load(ui_res, "r2c2.res");
 	root = new GLtk::Root(ui_res, window);
 	mouse.signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press));
 	mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Engineer::axis_motion));
@@ -224,6 +224,7 @@ void Engineer::tick()
 
 	if(picking && picking_track && picking_entry>=0)
 	{
+		camera.apply();
 		GL::MatrixStack::Push push_mat(GL::MatrixStack::modelview());
 
 		float rot = picking_track->get_endpoint_direction(picking_entry);