Changeset 9969

Timestamp:

Jan 4, 2014, 2:14:06 PM (11 years ago)

Author:

jo

Message:

Automatically show the menu for gametypes that call Gametype::end() - after a 3 second delay.

Location:

code/trunk/src/orxonox/gametypes

Files:

• Gametype.cc (modified) (6 diffs)
• Gametype.h (modified) (4 diffs)

code/trunk/src/orxonox/gametypes/Gametype.cc

@@ -35 +35 @@
 #include "core/GameMode.h"
 #include "core/command/ConsoleCommand.h"
+#include "gamestates/GSLevel.h"
 
 #include "infos/PlayerInfo.h"
@@ -61 +62 @@
         this->bAutoStart_ = false;
         this->bForceSpawn_ = false;
+        this->bAutoEnd_ = true;
         this->numberOfBots_ = 0;
 
@@ -104 +106 @@
         SetConfigValue(bAutoStart_, false);
         SetConfigValue(bForceSpawn_, false);
+        SetConfigValue(bAutoEnd_, true);
         SetConfigValue(numberOfBots_, 0);
         SetConfigValue(scoreboardTemplate_, "defaultScoreboard");
@@ -144 +147 @@
     {
         this->addBots(this->numberOfBots_);
-
         this->gtinfo_->start();
-
         this->spawnPlayersIfRequested();
     }
@@ -153 +154 @@
     {
         this->gtinfo_->end();
+        if (this->bAutoEnd_)
+            this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this)));
 
         for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
@@ -515 +518 @@
         this->time_ = t;
     }
+
+    void Gametype::showMenu()
+    {
+        GSLevel::startMainMenu();
+    }
 }

code/trunk/src/orxonox/gametypes/Gametype.h

@@ -40 +40 @@
 #include "tools/interfaces/Tickable.h"
 #include "infos/GametypeInfo.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -158 +159 @@
             inline unsigned int getNumberOfPlayers() const
                 { return this->players_.size(); }
-
+            void showMenu();
 
 
@@ -175 +176 @@
             bool bAutoStart_;
             bool bForceSpawn_;
+            bool bAutoEnd_;
 
             float time_;
@@ -197 +199 @@
             ConsoleCommand* dedicatedKillBots_;
             /* HACK HACK HACK */
-
+            Timer showMenuTimer_;
     };
 }