Changeset 6772

Timestamp:

Apr 22, 2010, 4:27:25 PM (14 years ago)

Author:

gionc

Message:

update Skybox Generator

Location:

code/branches/skybox2/src

Files:

• libraries/core/Core.cc (modified) (3 diffs)
• libraries/core/Core.h (modified) (2 diffs)
• modules/overlays/hud/GametypeStatus.cc (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
     SetCommandLineArgument(limitToCPU, 1).information("Limits the program to one CPU/core (1, 2, 3, etc.). Default is the first core (faster than off)");
@@ -148 +150 @@
         this->setConfigValues();
 
+        // no captions in gametype.
+        if(CommandLineParser::getValue("noGametypeCaptions").getBool())
+        {
+            ModifyConfigValue(bGametypeCaptions_, tset, false);
+        }
+
         // create persistent io console
         this->ioConsole_.reset(new IOConsole());
@@ -193 +201 @@
             .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()
@@ -108 +111 @@
             std::string                   language_;                   //!< The language
             bool                          bInitRandomNumberGenerator_; //!< If true, srand(time(0)) is called
+            bool                          bGametypeCaptions_;
 
             static Core*                  singletonPtr_s;

code/branches/skybox2/src/modules/overlays/hud/GametypeStatus.cc

@@ -30 +30 @@
 
 #include "util/Convert.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "infos/GametypeInfo.h"
@@ -60 +61 @@
             ControllableEntity* ce = this->owner_->getControllableEntity();
 
+            if(!Core::getInstance().hasGametypeCaptions()) // No captions are displayed.
+                return;
+
             if (!gtinfo->hasStarted() && !gtinfo->isStartCountdownRunning())
             {