Changeset 10575 for code/branches/core7/src/orxonox/gametypes/Gametype.cc

Timestamp:

Sep 9, 2015, 2:02:01 PM (9 years ago)

Author:

landauf

Message:

create the scoreboard directly with the correct gametype. this prevents that we have to re-set the gametype (and pass it to sub-overlays).

File:

• code/branches/core7/src/orxonox/gametypes/Gametype.cc (modified) (2 diffs)

code/branches/core7/src/orxonox/gametypes/Gametype.cc

@@ -64 +64 @@
 
         this->gtinfo_ = new GametypeInfo(context);
-        this->gtinfo_->setGametype(this);
 
         this->defaultControllableEntity_ = Class(Spectator);
+        this->scoreboard_ = 0;
 
         this->bAutoStart_ = false;
@@ -81 +81 @@
         this->setConfigValues();
 
+        ModifyConsoleCommand(__CC_addBots_name).setObject(this);
+        ModifyConsoleCommand(__CC_killBots_name).setObject(this);
+    }
+
+    Gametype::~Gametype()
+    {
+        if (this->isInitialized())
+        {
+            if (this->gtinfo_)
+                this->gtinfo_->destroy();
+
+            ModifyConsoleCommand(__CC_addBots_name).setObject(NULL);
+            ModifyConsoleCommand(__CC_killBots_name).setObject(NULL);
+        }
+    }
+
+    /**
+     * @brief Initializes sub-objects of the Gametype. This must be called after the constructor.
+     * At this point, the context is expected to have the current gametype. This allows to pass the current gametype to the sub-objects via constructor.
+     */
+    void Gametype::init()
+    {
         // load the corresponding score board
         if (GameMode::showsGraphics() && !this->scoreboardTemplate_.empty())
         {
-            this->scoreboard_ = new OverlayGroup(context);
+            this->scoreboard_ = new OverlayGroup(this->getContext());
             this->scoreboard_->addTemplate(this->scoreboardTemplate_);
-            this->scoreboard_->setGametype(this);
-        }
-        else
-            this->scoreboard_ = 0;
-
-        ModifyConsoleCommand(__CC_addBots_name).setObject(this);
-        ModifyConsoleCommand(__CC_killBots_name).setObject(this);
-    }
-
-    Gametype::~Gametype()
-    {
-        if (this->isInitialized())
-        {
-            if (this->gtinfo_)
-                this->gtinfo_->destroy();
-
-            ModifyConsoleCommand(__CC_addBots_name).setObject(NULL);
-            ModifyConsoleCommand(__CC_killBots_name).setObject(NULL);
         }
     }