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

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 4a35c8e..897c7ca 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -27,6 +27,8 @@ Distributed under the GPL
 #include "libmarklin/driver.h"
 #include "libmarklin/tracktype.h"
 #include "3d/path.h"
+#include "3d/track.h"
+#include "3d/vehicle.h"
 #include "engineer.h"
 #include "mainpanel.h"
 #include "trainpanel.h"
@@ -70,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");
@@ -112,7 +116,7 @@ Engineer::~Engineer()
 {
 	const map<unsigned, Train *> &trains = layout.get_trains();
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-		i->second->set_speed(0);
+		layout.get_driver().set_loco_speed(i->first, 0);
 	layout.get_driver().flush();
 
 	if(!options.simulate)
@@ -321,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);
 }
 
@@ -391,9 +396,9 @@ void Engineer::train_added(Train &train)
 	train_panels.push_back(tpanel);
 	tpanel->set_visible(true);
 
-	Train3D &t3d = layout_3d.get_train(train);
-	overlay->set_label(t3d, train.get_name());
-	train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(t3d)));
+	Vehicle3D &loco3d = layout_3d.get_vehicle(train.get_vehicle(0));
+	overlay->set_label(loco3d, train.get_name());
+	train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(loco3d)));
 
 	GL::Color best_color;
 	float best_d_sq = 0;
@@ -431,7 +436,7 @@ void Engineer::sighandler(int sig)
 		IO::print(IO::cerr, "Fatal signal received, terminating\n");
 		const map<unsigned, Train *> &trains = layout.get_trains();
 		for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-			i->second->set_speed(0);
+			layout.get_driver().set_loco_speed(i->first, 0);
 		layout.get_driver().flush();
 		raise(sig);
 	}