Changeset 9977 for code/trunk

Timestamp:

Jan 4, 2014, 9:42:47 PM (11 years ago)

Author:

jo

Message:

So far so good. Unfortunately I did not figure out what is wrong with the timer.

Location:

code/trunk

Files:

• data/gui/scripts/MiscConfigMenu.lua (modified) (2 diffs)
• src/orxonox/gametypes/Gametype.cc (modified) (5 diffs)
• src/orxonox/gametypes/Gametype.h (modified) (2 diffs)

code/trunk/data/gui/scripts/MiscConfigMenu.lua

@@ -30 +30 @@
     table.insert(P.commandList, "Gametype initialStartCountdown_")
     table.insert(P.commandList, "Gametype bAutoStart_")
-    --table.insert(P.commandList, "Gametype bAutoEnd_")
+    table.insert(P.commandList, "Gametype bAutoEnd_")
     table.insert(P.commandList, "Gametype numberOfBots_")
     table.insert(P.commandList, "UnderAttack gameTime_")
@@ -55 +55 @@
     table.insert(P.nameList, "Start countdown")
     table.insert(P.nameList, "Autostart")
-    --table.insert(P.nameList, "Autoend")
+    table.insert(P.nameList, "Autoend")
     table.insert(P.nameList, "Number of Bots")
     table.insert(P.nameList, "UnderAttack: game time")

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

@@ -35 +35 @@
 #include "core/GameMode.h"
 #include "core/command/ConsoleCommand.h"
-//#include "gamestates/GSLevel.h"
+#include "gamestates/GSLevel.h"
 
 #include "infos/PlayerInfo.h"
@@ -62 +62 @@
         this->bAutoStart_ = false;
         this->bForceSpawn_ = false;
-        //this->bAutoEnd_ = true;
+        this->bAutoEnd_ = true;
         this->numberOfBots_ = 0;
 
@@ -106 +106 @@
         SetConfigValue(bAutoStart_, false);
         SetConfigValue(bForceSpawn_, false);
-        //SetConfigValue(bAutoEnd_, true);
+        SetConfigValue(bAutoEnd_, true);
         SetConfigValue(numberOfBots_, 0);
         SetConfigValue(scoreboardTemplate_, "defaultScoreboard");
@@ -154 +154 @@
     {
         this->gtinfo_->end();
-        //if (this->bAutoEnd_)
-        //    this->showMenuTimer_.setTimer(2.5f, true, createExecutor(createFunctor(&Gametype::showMenu, this)));
+        if (this->bAutoEnd_)
+        {
+            GSLevel::startMainMenu();
+            //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)
@@ -519 +522 @@
     }
 
-    //void Gametype::showMenu()
-    //{
-    //  GSLevel::startMainMenu();
-    //}
+    void Gametype::showMenu()
+    {
+        GSLevel::startMainMenu();
+    }
 }

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

@@ -159 +159 @@
             inline unsigned int getNumberOfPlayers() const
                 { return this->players_.size(); }
-            //void showMenu();
+            void showMenu();
 
 
@@ -176 +176 @@
             bool bAutoStart_;
             bool bForceSpawn_;
-            //bool bAutoEnd_;
+            bool bAutoEnd_;
 
             float time_;