Changeset 6858 for code/branches/skybox2/src/libraries/core

Timestamp:

May 6, 2010, 1:11:43 PM (15 years ago)

Author:

dafrick

Message:

Made noCaption feature needed for skybox much nice.

Location:

code/branches/skybox2/src/libraries/core

Files:

• Core.cc (modified) (3 diffs)
• Core.h (modified) (2 diffs)

code/branches/skybox2/src/libraries/core/Core.cc

@@ -78 +78 @@
 
     SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
-    SetCommandLineSwitch(noGametypeCaptions).information("Use this if you don't want to use Gametype captions.");
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
@@ -150 +149 @@
         this->setConfigValues();
 
-        // no captions in gametype.
-        if(CommandLineParser::getValue("noGametypeCaptions").getBool())
-        {
-            ModifyConfigValue(bGametypeCaptions_, tset, false);
-        }
-
         // create persistent io console
         this->ioConsole_.reset(new IOConsole());
@@ -201 +194 @@
             .description("If true, all random actions are different each time you start the game")
             .callback(this, &Core::initRandomNumberGenerator);
-        SetConfigValue(bGametypeCaptions_, true)
-            .description("Set to false if you don't want to use Gametype captions.");
     }
 

code/branches/skybox2/src/libraries/core/Core.h

@@ -67 +67 @@
             void setConfigValues();
 
-            inline bool hasGametypeCaptions(void)
-                { return this->bGametypeCaptions_; }
-
             //! Returns the configured language.
             const std::string& getLanguage()
@@ -111 +108 @@
             std::string                   language_;                   //!< The language
             bool                          bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called
-            bool                          bGametypeCaptions_;
 
             static Core*                  singletonPtr_s;