Changeset 719 for code/branches/FICN

Timestamp:

Dec 29, 2007, 1:59:22 AM (17 years ago)

Author:

landauf

Message:

small hack with a static bool to add a description to the language config value without getting an infinite recursion

File:

• code/branches/FICN/src/orxonox/core/Language.cc (modified) (2 diffs)

code/branches/FICN/src/orxonox/core/Language.cc

@@ -69 +69 @@
         this->defaultTranslation_ = "ERROR: LANGUAGE ENTRY DOESN'T EXIST!";
         this->readDefaultLanguageFile();
-
-        this->setConfigValues();
     }
 
     void Language::setConfigValues()
     {
-        SetConfigValue(language_, this->defaultLanguage_);
+        SetConfigValue(language_, this->defaultLanguage_).description("The language of the ingame text");
         this->readTranslatedLanguageFile();
     }
@@ -82 +80 @@
     {
         static Language theOnlyLanguageObject = Language();
+        static bool bCreatingTheOnlyLanguageObject = true;
+
+        if (bCreatingTheOnlyLanguageObject)
+        {
+            bCreatingTheOnlyLanguageObject = false;
+            theOnlyLanguageObject.setConfigValues();
+        }
+
         return theOnlyLanguageObject;
     }