Changeset 2361 for code/branches/objecthierarchy2/src/core/Core.cc

Timestamp:

Dec 9, 2008, 2:07:24 AM (16 years ago)

Author:

landauf

Message:

• Fixed a problem with SUPER in combination with a pure-virtual base-function when called from a direct child of the base-class.

• Added random number generator initialization to Core (configurable)

• Fixed a bug in Convert.h

File:

• code/branches/objecthierarchy2/src/core/Core.cc (modified) (3 diffs)

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

@@ -56 +56 @@
         RegisterRootObject(Core);
 
-        assert(singletonRef_s == 0);
-        singletonRef_s = this;
+        assert(this->singletonRef_s == 0);
+        this->singletonRef_s = this;
+        this->bInitializeRandomNumberGenerator_ = false;
 
         this->setConfigValues();
@@ -80 +81 @@
         SetConfigValue(softDebugLevelShell_, 1).description("The maximal level of debug output shown in the ingame shell").callback(this, &Core::debugLevelChanged);
         SetConfigValue(language_, Language::getLanguage().defaultLanguage_).description("The language of the ingame text").callback(this, &Core::languageChanged);
+        SetConfigValue(bInitializeRandomNumberGenerator_, true).description("If true, all random actions are different each time you start the game").callback(this, &Core::initializeRandomNumberGenerator);
     }
 
@@ -174 +176 @@
         ResetConfigValue(language_);
     }
+
+    void Core::initializeRandomNumberGenerator()
+    {
+        static bool bInitialized = false;
+        if (!bInitialized && this->bInitializeRandomNumberGenerator_)
+        {
+            srand(time(0));
+            rand();
+            bInitialized = true;
+        }
+    }
 }