Changeset 1949 for code/branches/objecthierarchy/src/orxonox/objects/infos

Timestamp:

Oct 19, 2008, 2:24:33 PM (16 years ago)

Author:

rgrieder

Message:

Moved all showsGraphics, hasServer, etc. functions from Settings class to Core class.
This was necessary to avoid circular dependencies.

Location:

code/branches/objecthierarchy/src/orxonox/objects/infos

Files:

• LevelInfo.cc (modified) (3 diffs)
• PlayerInfo.cc (modified) (5 diffs)

code/branches/objecthierarchy/src/orxonox/objects/infos/LevelInfo.cc

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "core/Core.h"
 
-#include "Settings.h"
 #include "GraphicsEngine.h"
 
@@ -72 +72 @@
     void LevelInfo::setSkybox(const std::string& skybox)
     {
-        if (Settings::showsGraphics())
+        if (Core::showsGraphics())
             if (GraphicsEngine::getInstance().getLevelSceneManager())
                 GraphicsEngine::getInstance().getLevelSceneManager()->setSkyBox(true, skybox);
@@ -81 +81 @@
     void LevelInfo::setAmbientLight(const ColourValue& colour)
     {
-        if (Settings::showsGraphics())
+        if (Core::showsGraphics())
             GraphicsEngine::getInstance().getLevelSceneManager()->setAmbientLight(colour);
 

code/branches/objecthierarchy/src/orxonox/objects/infos/PlayerInfo.cc

@@ -35 +35 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/XMLPort.h"
+#include "core/Core.h"
 
 #include "network/Host.h"
 
-#include "Settings.h"
 #include "GraphicsEngine.h"
 #include "objects/gametypes/Gametype.h"
@@ -51 +51 @@
 
         this->ping_ = -1;
-        this->bLocalPlayer_ = Settings::isStandalone();
+        this->bLocalPlayer_ = Core::isStandalone();
         this->bLocalPlayer_ = false;
         this->bHumanPlayer_ = false;
@@ -78 +78 @@
     {
 std::cout << "# PI(" << this->getObjectID() << "): checkName: " << this->bLocalPlayer_ << std::endl;
-        if (this->bLocalPlayer_ && Settings::isMaster())
+        if (this->bLocalPlayer_ && Core::isMaster())
             this->setName(this->playerName_);
     }
@@ -114 +114 @@
 //std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): name: " << this->getName() << std::endl;
 
-            if (Settings::isClient())
+            if (Core::isClient())
             {
 std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): we're on a client: set object mode to bidirectional" << std::endl;
@@ -134 +134 @@
     {
 std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): " << this->bFinishedSetup_ << std::endl;
-        if (Settings::isClient())
+        if (Core::isClient())
         {
 std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a client: finish setup" << std::endl;