Changeset 3366 for code/branches/resource/src/core/Core.cc

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

File:

• code/branches/resource/src/core/Core.cc (modified) (5 diffs)

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

@@ -83 +83 @@
 {
     //! Static pointer to the singleton
-    Core* Core::singletonRef_s  = 0;
+    Core* Core::singletonPtr_s  = 0;
 
     SetCommandLineArgument(mediaPath, "").information("Path to the media/data files");
@@ -139 +139 @@
                 .callback(this, &CoreConfiguration::debugLevelChanged);
 
-            SetConfigValue(language_, Language::getLanguage().defaultLanguage_)
+            SetConfigValue(language_, Language::getInstance().defaultLanguage_)
                 .description("The language of the ingame text")
                 .callback(this, &CoreConfiguration::languageChanged);
@@ -179 +179 @@
         {
             // Read the translation file after the language was configured
-            Language::getLanguage().readTranslatedLanguageFile();
+            Language::getInstance().readTranslatedLanguageFile();
         }
 
@@ -252 +252 @@
         // Cleanup guard for external console commands that don't belong to an Identifier
         , consoleCommandDestroyer_(CommandExecutor::destroyExternalCommands)
+        , configuration_(new CoreConfiguration()) // Don't yet create config values!
         , bDevRun_(false)
         , bGraphicsLoaded_(false)
-        , configuration_(new CoreConfiguration()) // Don't yet create config values!
-    {
-        if (singletonRef_s != 0)
-        {
-            COUT(0) << "Error: The Core singleton cannot be recreated! Shutting down." << std::endl;
-            abort();
-        }
-        Core::singletonRef_s = this;
-
+    {
         // Parse command line arguments first
         CommandLine::parseCommandLine(cmdLine);
@@ -328 +321 @@
     Core::~Core()
     {
-        // Don't assign singletonRef_s with NULL! Recreation is not supported
-        // The is quite simply because of the pre-main code that uses heap allocation
-        // And we correctly deallocate these resources in this destructor.
     }