Changeset 3253

Timestamp:

Jun 29, 2009, 10:00:40 PM (15 years ago)

Author:

rgrieder

Message:

Minor fixes and changes.

Location:

code/branches/core4

Files:

• cmake/BuildConfigMSVC.cmake (modified) (1 diff)
• src/core/Core.cc (modified) (4 diffs)
• src/orxonox/Main.cc (modified) (1 diff)

code/branches/core4/cmake/BuildConfigMSVC.cmake

@@ -35 +35 @@
 
 # Currently VLD has a problem with MSVC9 although it actually is supported
-IF(MSVC8)
+IF(MSVC80)
   OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" off)
 ENDIF()

code/branches/core4/src/core/Core.cc

@@ -229 +229 @@
     Core::Core(int argc, char** argv)
     {
-        assert(Core::singletonRef_s == 0);
+        if (singletonRef_s != 0)
+        {
+            COUT(0) << "Error: The Core singleton cannot be recreated! Shutting down." << std::endl;
+            abort();
+        }
         Core::singletonRef_s = this;
 
@@ -264 +268 @@
         int limitToCPU = CommandLine::getValue("limitToCPU");
         if (limitToCPU > 0)
-            setThreadAffinity((unsigned int)limitToCPU);
+            setThreadAffinity(static_cast<unsigned int>(limitToCPU));
 
         // Manage ini files and set the default settings file (usually orxonox.ini)
@@ -271 +275 @@
             CommandLine::getValue("settingsFile").getString());
 
+        // Required as well for the config values
         this->languageInstance_ = new Language();
 
@@ -308 +313 @@
         // Also delete external console command that don't belong to an Identifier
         CommandExecutor::destroyExternalCommands();
-
         // Clean up class hierarchy stuff (identifiers, XMLPort, configValues, consoleCommand)
         Identifier::destroyAllIdentifiers();
 
-        assert(Core::singletonRef_s);
-        Core::singletonRef_s = 0;
         delete this->signalHandler_;
+
+        // Don't assign singletonRef_s with NULL! Recreation is not supported
     }
 

code/branches/core4/src/orxonox/Main.cc

@@ -88 +88 @@
 
     game->run();
+    delete game;
 
     return 0;