Stop all trains when Engineer exits

[r2c2.git] / source / engineer / engineer.cpp

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 777758700a4a857bf81df07c42d4a8cb7975ae50..6a35a06a3317992dae0075dece5eecfe72e43ddd 100644 (file)
--- 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;
@@ -176,6 +192,10 @@ int Engineer::main()
                y -= tpanel->get_geometry().h;
        }
 
+       const list<Block *> &blocks = trfc_mgr->get_blocks();
+       for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+               reset_block_color(**i);
+
        wnd->show();
 
        Application::main();
@@ -265,6 +285,9 @@ void Engineer::tick()
        const list<Train *> &trains = trfc_mgr->get_trains();
        for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
        {
+               if(!(*i)->is_placed())
+                       continue;
+
                GL::PushMatrix _push;
 
                const Point &tp = (*i)->get_position();
@@ -307,7 +330,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
                {
                        set_block_color(*placing_block, GL::Color(1, 1, 1));
 
-                       placing_train->place(placing_block, placing_entry);
+                       placing_train->place(*placing_block, placing_entry);
                        placing_train = 0;
                        main_panel->set_status_text(string());
                }
@@ -494,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;