Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7361 in orxonox.OLD for branches


Ignore:
Timestamp:
Apr 25, 2006, 2:44:43 PM (19 years ago)
Author:
rennerc
Message:

added signalhandling class to orx

Location:
branches/signals/src
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/signals/src/lib/network/network_socket.cc

    r6994 r7361  
    120120void NetworkSocket::connectToServer(IPaddress ip)
    121121{
     122  //HACK this will cause segfault
     123#warning remove this
     124  int * a;
     125  *a = 99;
    122126  //check if not already connected or listening
    123127  if (tcpSocket)
  • branches/signals/src/orxonox.cc

    r7355 r7361  
    3434#include "parser/ini_parser/ini_parser.h"
    3535#include "util/loading/game_loader.h"
     36#include "util/signal_handler.h"
    3637
    3738//ENGINES
     
    8485REGISTER_ARG_ARG(  _, music_volume, "audio", "Music-Volume", "Sets music volume", "vol" );
    8586REGISTER_ARG_ARG(  _, effects_volume, "audio", "Effects-Volume", "Sets effects volume", "vol" );
     87
     88#ifndef __WIN32__
     89REGISTER_ARG_FLAG( _, start_gdb_on_signal, "misc", "start-gdb", "Start gdb on signal", "1");
     90REGISTER_ARG_FLAG( _, write_bt_to_file, "misc", "bt-to-file", "Write backtrace to file", "1");
     91#endif
    8692
    8793/**
     
    428434  }
    429435 
     436#ifndef __WIN32__
     437  if ( Preferences::getInstance()->getString("misc", "start-gdb", "0") == "1" )
     438  {
     439    SignalHandler::getInstance()->doCatch( argv[0], GDB_RUN_IN_FOREGROUND );
     440  }
     441  else if ( Preferences::getInstance()->getString("misc", "bt-to-file", "1") == "1" )
     442  {      SignalHandler::getInstance()->doCatch( argv[0], GDB_RUN_WRITE_TO_FILE );
     443   
     444  }
     445#endif
     446 
    430447  if( Preferences::getInstance()->getString("game", "showGui", "") == "1" )
    431448    showGui = true;
  • branches/signals/src/util/Makefile.am

    r7221 r7361  
    1010                        game_rules.cc \
    1111                        multiplayer_team_deathmatch.cc \
     12                        signal_handler.cc \
    1213                        \
    1314                        animation/animation3d.cc \
     
    2627                        game_rules.h \
    2728                        multiplayer_team_deathmatch.h \
     29                        signal_handler.h \
    2830                        \
    2931                        animation/animation3d.h \
Note: See TracChangeset for help on using the changeset viewer.