X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;fp=source%2Fengineer%2Fengineer.cpp;h=cc604d3254bf747a150035b5b2c6dd52255d579e;hb=9cb5f9ef3c0eaac499ef5d045c513116d6809e56;hp=789c6055cd699ce621a8c7f137a113bbacc4eb4b;hpb=31f95d95a1cc7cf17df8de57ea122482d5f4a859;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 789c605..cc604d3 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -77,7 +77,7 @@ Engineer::Engineer(int argc, char **argv):
 	if(layout.has_driver())
 		layout.get_driver().signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected));
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
-	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
+	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::emergency));
 	const set<Block *> &blocks = layout.get_all<Block>();
 	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
 		if(TrackCircuit *tc = (*i)->get_sensor())
@@ -299,6 +299,11 @@ Object *Engineer::pick_object(const Vector &p)
 	return layout.pick<Track>(Ray(start, Vector(ray)));
 }
 
+void Engineer::emergency(Block *, const string &msg)
+{
+	set_status(msg);
+}
+
 void Engineer::locomotive_detected(const Driver::DetectedLocomotive &loco)
 {
 	if(!import_active)