Changeset 9980 for code/trunk/src

Timestamp:

Jan 4, 2014, 11:20:26 PM (11 years ago)

Author:

jo

Message:

Adding delay timer to show the main menu after a game ended automatically.

Location:

code/trunk/src/orxonox/gametypes

Files:

• Gametype.cc (modified) (1 diff)
• Gametype.h (modified) (2 diffs)

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

@@ -155 +155 @@
         this->gtinfo_->end();
         if (this->bAutoEnd_)
-        {
-            GSLevel::startMainMenu();
-            //this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this)));
+        {
+            this->showMenuTimer_.setTimer(3.0f, true, createExecutor(createFunctor(&Gametype::showMenu, this)));
         }
 

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

@@ -40 +40 @@
 #include "tools/interfaces/Tickable.h"
 #include "infos/GametypeInfo.h"
-//#include "tools/Timer.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -199 +199 @@
             ConsoleCommand* dedicatedKillBots_;
             /* HACK HACK HACK */
-            //Timer showMenuTimer_;
+            Timer showMenuTimer_;
     };
 }