Changeset 2181 for code/branches

Timestamp:

Nov 12, 2008, 12:56:15 AM (16 years ago)

Author:

rgrieder

Message:

Moved instantiation of stats overlay from GSLevel to Gametype.

Location:

code/branches/overlay/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (2 diffs)
• gamestates/GSLevel.h (modified) (1 diff)
• objects/gametypes/Gametype.cc (modified) (2 diffs)
• objects/gametypes/Gametype.h (modified) (3 diffs)
• overlays/OrxonoxOverlay.cc (modified) (1 diff)

code/branches/overlay/src/orxonox/gamestates/GSLevel.cc

@@ -60 +60 @@
         , radar_(0)
         , startFile_(0)
-        , stats_(0)
         , cameraManager_(0)
         , levelManager_(0)
@@ -94 +93 @@
             // Start the Radar
             this->radar_ = new Radar();
-
-            stats_ = new XMLFile(Settings::getDataPath() + "overlay/stats.oxo");
-            Loader::open(stats_);
         }
 

code/branches/overlay/src/orxonox/gamestates/GSLevel.h

@@ -68 +68 @@
         Radar*                radar_;            //!< represents the Radar (not the HUD part)
         XMLFile*              startFile_;        //!< current hard coded default level
-        XMLFile*              stats_;
         CameraManager*        cameraManager_;
         LevelManager*         levelManager_;

code/branches/overlay/src/orxonox/objects/gametypes/Gametype.cc

@@ -34 +34 @@
 
 #include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/Loader.h"
+#include "core/XMLFile.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/worldentities/pawns/Spectator.h"
@@ -58 +61 @@
         this->startCountdown_ = 0;
         this->bStartCountdownRunning_ = false;
+
+        this->statsOverlay_ = 0;
+
+        setConfigValues();
+
+        // load the corresponding score board
+        statsOverlay_ = new XMLFile(Settings::getDataPath() + "overlay/" + this->statsOverlayName_);
+        Loader::open(statsOverlay_);
+    }
+
+    void Gametype::setConfigValues()
+    {
+        SetConfigValue(statsOverlayName_, "stats.oxo");
     }
 

code/branches/overlay/src/orxonox/objects/gametypes/Gametype.h

@@ -44 +44 @@
     {
         friend class PlayerInfo;
+        friend class ClassIdentifier<Gametype>;
 
         public:
@@ -82 +83 @@
 
         private:
+            void setConfigValues();
+
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
 
@@ -105 +108 @@
             std::set<SpawnPoint*> spawnpoints_;
             SubclassIdentifier<ControllableEntity> defaultControllableEntity_;
+
+            XMLFile* statsOverlay_;
+
+            // Config Values
+            std::string statsOverlayName_;
     };
 }

code/branches/overlay/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -87 +87 @@
         setPosition(Vector2(0.0f, 0.0f));
         setRotation(Degree(0.0));
-        setAspectCorrection(true);
+        setAspectCorrection(false);
         setBackgroundMaterial("");
     }