X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=897c7ca1ea8121f21d205a26d007b4ec35e26f8a;hb=e990eb02d42cc4b9ff679b947a6911f79472f8f5;hp=92f0f0f419e451c98676597f9954b216c0717b42;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 92f0f0f..897c7ca 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -72,10 +72,12 @@ Engineer::Engineer(int argc, char **argv):
 	// Setup railroad control
 	DataFile::load(catalogue, "tracks.dat");
 	DataFile::load(catalogue, "locos.dat");
+	DataFile::load(catalogue, "wagons.dat");
 	DataFile::load(layout, options.layout_fn);
 
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
+	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
 	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Engineer::sensor_event));
 	if(FS::exists("engineer.state"))
 		DataFile::load(layout, "engineer.state");
@@ -323,6 +325,7 @@ void Engineer::view_all()
 	camera.set_position(pos);
 	camera.set_up_direction(up);
 	camera.set_look_direction(GL::Vector3(0, 0, -1));
+	camera.set_aspect(float(window.get_width())/window.get_height());
 	camera.set_depth_clip(pos.z*0.5, pos.z*1.5);
 }