X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=d4a0e4446ccb1cda3065bb68f84893703ecdc92d;hb=6968273080fa2a1cbcfc506610d5f249299611e9;hp=d1a123bb7b5e44282e7045da291309a67a8dc91c;hpb=e5cd9e4fbc577036a0385c985b6b65df8218d0a2;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index d1a123b..d4a0e44 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -72,6 +72,7 @@ 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));
@@ -114,7 +115,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)
@@ -433,7 +434,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);
 	}