Changeset 2662 for code/trunk/src/core/RootGameState.cc

Timestamp:

Feb 14, 2009, 10:17:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

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

code/trunk/src/core/RootGameState.cc

@@ -31 +31 @@
 #include "util/Debug.h"
 #include "util/Exception.h"
-#include "Core.h"
 #include "Clock.h"
 #include "CommandLine.h"
@@ -123 +122 @@
     /**
     @brief
+        Main loop of the orxonox game.
         Starts the game. The little 'while' denotes the main loop.
         Whenever the root state is selected, the game ends.
     @param name
         State to start with (usually main menu or specified by command line)
+    @note
+        We use the Ogre::Timer to measure time since it uses the most precise
+        method an a platform (however the windows timer lacks time when under
+        heavy kernel load!).
     */
     void RootGameState::start()
     {
-#ifdef NDEBUG
+        // Don't catch errors when having a debugger in msvc
+#if ORXONOX_COMPILER != ORXONOX_COMPILER_MSVC || defined(NDEBUG)
         try
         {
@@ -136 +141 @@
             // start global orxonox time
             Clock clock;
-
-            // create the Core settings to configure the output level
-            Core::getInstance();
 
             this->activate();
@@ -156 +158 @@
 
             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 +164 @@
         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