Changeset 2442 for code/branches/physics_merge/src/core/RootGameState.cc

Timestamp:

Dec 14, 2008, 4:16:52 PM (16 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

• . (modified) (1 prop)
• src/core/RootGameState.cc (modified) (3 diffs)

code/branches/physics_merge/src/core/RootGameState.cc

@@ -130 +130 @@
     void RootGameState::start()
     {
-#ifdef NDEBUG
+        // Don't catch errors when having a debugger in msvc
+#if ORXONOX_COMPILER != ORXONOX_COMPILER_MSVC || defined(NDEBUG)
         try
         {
@@ -156 +157 @@
 
             this->deactivate();
-#ifdef NDEBUG
+#if ORXONOX_COMPILER != ORXONOX_COMPILER_MSVC || defined(NDEBUG)
         }
         // Note: These are all unhandled exceptions that should not have made its way here!
@@ -162 +163 @@
         catch (std::exception& ex)
         {
-            COUT(1) << ex.what() << std::endl;
-            COUT(1) << "Program aborted." << std::endl;
+            COUT(0) << ex.what() << std::endl;
+            COUT(0) << "Program aborted." << std::endl;
+            abort();
         }
         // anything that doesn't inherit from std::exception
         catch (...)
         {
-            COUT(1) << "An unidentifiable exception has occured. Program aborted." << std::endl;
+            COUT(0) << "An unidentifiable exception has occured. Program aborted." << std::endl;
+            abort();
         }
 #endif