[Orxonox-commit 4248] r8919 - in code/branches/environment3: data/levels data/levels/includes src/libraries/util

[fmauro at orxonox.net]

Author: fmauro
Date: 2011-11-02 15:43:42 +0100 (Wed, 02 Nov 2011)
New Revision: 8919

Modified:
   code/branches/environment3/data/levels/asteroidField.oxw
   code/branches/environment3/data/levels/includes/asteroidField.lua
   code/branches/environment3/src/libraries/util/SignalHandler.cc
Log:
Corrected error in comments

Modified: code/branches/environment3/data/levels/asteroidField.oxw
===================================================================
--- code/branches/environment3/data/levels/asteroidField.oxw	2011-11-02 14:36:21 UTC (rev 8918)
+++ code/branches/environment3/data/levels/asteroidField.oxw	2011-11-02 14:43:42 UTC (rev 8919)
@@ -36,7 +36,7 @@
     <!-- Generate asteroid field with diameter 12000 containing 250 asteroids -->    
     <?lua
     	dofile("includes/asteroidField.lua")
-    	asteroidField(0, 0, 0, 150, 50,12000, 250)
+    	asteroidField(0, 0, 0, 150, 50, 12000, 250)
     ?>
     
   </Scene>

Modified: code/branches/environment3/data/levels/includes/asteroidField.lua
===================================================================
--- code/branches/environment3/data/levels/includes/asteroidField.lua	2011-11-02 14:36:21 UTC (rev 8918)
+++ code/branches/environment3/data/levels/includes/asteroidField.lua	2011-11-02 14:43:42 UTC (rev 8919)
@@ -1,10 +1,10 @@
 --[[ asteroid field generator
---[[ 
---[[ generates asteroid field
---[[ posX, posY, posZ - position in space
---[[ minSize, maxSize - size boundaries of each asteroid
---[[ radius - size of the cube around position in space
---[[ count - number of asteroids
+generates asteroid field
+	posX, posY, posZ - position in space
+	minSize, maxSize - size boundaries of each asteroid
+	radius - size of the cube around position in space
+	count - number of asteroids
+--]]
 function asteroidField(posX, posY, posZ, minSize, maxSize, radius, count)
 	for i = 1, count, 1
 	do

Modified: code/branches/environment3/src/libraries/util/SignalHandler.cc
===================================================================
--- code/branches/environment3/src/libraries/util/SignalHandler.cc	2011-11-02 14:36:21 UTC (rev 8918)
+++ code/branches/environment3/src/libraries/util/SignalHandler.cc	2011-11-02 14:43:42 UTC (rev 8919)
@@ -69,7 +69,7 @@
       assert( sigRecList.size() == 0 );
 
       catchSignal( SIGSEGV );
-      catchSignal( SIGABRT );
+//      catchSignal( SIGABRT );
       catchSignal( SIGILL );
     }
 
@@ -126,7 +126,7 @@
       // if the signalhandler has already been destroyed then don't do anything
       if( SignalHandler::singletonPtr_s == 0 )
       {
-        orxout(user_error) << "Received signal " << sigName.c_str() << endl << "Can't write backtrace because SignalHandler is already destroyed" << endl;
+        orxout(user_error) << "Received signal(sigHandler already destroyed) " << sigName.c_str() << endl << "Can't write backtrace because SignalHandler is already destroyed" << endl;
         exit(EXIT_FAILURE);
       }
 
@@ -136,7 +136,7 @@
       }
 
 
-      orxout(user_error) << "Received signal " << sigName.c_str() << endl << "Try to write backtrace to file orxonox_crash.log" << endl;
+      orxout(user_error) << "Received signal(second error) " << sigName.c_str() << endl << "Try to write backtrace to file orxonox_crash.log" << endl;
 
       
       // First start GDB which will be attached to this process later on