X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=97749033b00669421be127c7cb55cc9ec54be5b1;hb=48dff17ed3144d944965e7cb534e1f8fb92bd620;hp=308e5b2d4db0e80437a790ac7cbd1bf8ae38075c;hpb=4d84248a4990e913a56f013e67a608ad9698233e;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 308e5b2..9774903 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -7,6 +7,7 @@ Distributed under the GPL
 
 #include <cmath>
 #include <limits>
+#include <signal.h>
 #include <GL/gl.h>
 #include <msp/core/except.h>
 #include <msp/core/getopt.h>
@@ -17,6 +18,7 @@ Distributed under the GPL
 #include <msp/gl/matrix.h>
 #include <msp/gl/projection.h>
 #include <msp/gl/transform.h>
+#include <msp/io/print.h>
 #include <msp/strings/formatter.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/regex.h>
@@ -105,10 +107,24 @@ Engineer::Engineer(int argc, char **argv):
 		i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Engineer::sensor_event), i->second));
 
 	view_all();
+
+	catch_signal(SIGINT);
+	catch_signal(SIGTERM);
+	catch_signal(SIGSEGV);
+	catch_signal(SIGILL);
+	catch_signal(SIGFPE);
+	catch_signal(SIGABRT);
 }
 
 Engineer::~Engineer()
 {
+	const list<Train *> &trains = trfc_mgr->get_trains();
+	for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+		(*i)->set_speed(0);
+
+	while(control.get_queue_length())
+		control.tick();
+
 	if(!simulate)
 		trfc_mgr->save("engineer.state");
 	delete trfc_mgr;
@@ -222,11 +238,11 @@ void Engineer::tick()
 	//glEnable(GL_DEPTH_TEST);
 	glEnable(GL_MULTISAMPLE);
 
-	layout_3d.render();
+	layout_3d.get_scene().render();
 
 	glDisable(GL_LIGHTING);
 	glColor4f(1, 1, 1, 1);
-	const list<Track3D *> &ltracks = layout_3d.get_tracks();
+	/*const list<Track3D *> &ltracks = layout_3d.get_tracks();
 	for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
 	{
 		Track &track = (*i)->get_track();
@@ -237,7 +253,7 @@ void Engineer::tick()
 		}
 		else
 			(*i)->render_path(-1);
-	}
+	}*/
 
 	if(placing_train && placing_block)
 	{
@@ -501,4 +517,20 @@ void Engineer::train_added(Train &train)
 	place_train(train);
 }
 
+void Engineer::sighandler(int sig)
+{
+	if(sig==SIGSEGV || sig==SIGILL || sig==SIGFPE || sig==SIGABRT)
+	{
+		signal(sig, SIG_DFL);
+		IO::print(IO::cerr, "Fatal signal received, terminating\n");
+		const map<unsigned, Locomotive *> &locos = control.get_locomotives();
+		for(map<unsigned, Locomotive *>::const_iterator i=locos.begin(); i!=locos.end(); ++i)
+			i->second->set_speed(0);
+		control.flush();
+		raise(sig);
+	}
+	else if(sig==SIGTERM || sig==SIGINT)
+		exit(0);
+}
+
 Application::RegApp<Engineer> Engineer::reg;