Changeset 7876 for code/trunk

Timestamp:

Feb 13, 2011, 5:49:41 PM (14 years ago)

Author:

dafrick

Message:

Extending startGame and similar console commands, now also the level to be started (or in case of startClient, the destination) can be specified (but doesn't have to).
Additionally startMainMenu is now in GSLevel and can only be executed in a Level, as opposed to only in the MainMenu as it was before.
Added changeGame console command which works in a level in standalone mode to change to a different level.

Location:

code/trunk

Files:

• data/gui/scripts/HostMenu.lua (modified) (1 diff)
• data/gui/scripts/MultiplayerMenu.lua (modified) (1 diff)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)
• src/orxonox/gamestates/GSLevel.cc (modified) (4 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (5 diffs)
• src/orxonox/gamestates/GSMainMenu.h (modified) (1 diff)

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

@@ -104 +104 @@
         local level = P.levelList[index+1]
         if level ~= nil then
-            orxonox.LevelManager:getInstance():setDefaultLevel(level:getXMLFilename())
-            orxonox.execute(P.multiplayerMode)
+            orxonox.execute(P.multiplayerMode .. " " .. level:getXMLFilename())
             hideAllMenuSheets()
         end

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

@@ -75 +75 @@
 
 function P.MultiplayerJoinButton_clicked(e)
-    local choice = winMgr:getWindow("orxonox/MultiplayerListbox"):getFirstSelectedItem()   
+    local choice = winMgr:getWindow("orxonox/MultiplayerListbox"):getFirstSelectedItem()
+    local destination = nil
     if choice then
-        local client = orxonox.Client:getInstance()
         local index = tolua.cast(choice, "CEGUI::ListboxItem"):getID()
-        client:setDestination( P.serverList[index][2], 55556 )
+        destination = P.serverList[index][2]
     else
         return
     end
-    orxonox.execute("startClient")
+    orxonox.execute("startClient " .. destination)
     hideAllMenuSheets()
 end

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

@@ -74 +74 @@
         local level = P.levelList[index+1]
         if level ~= nil then
-            orxonox.LevelManager:getInstance():setDefaultLevel(level:getXMLFilename())
-            orxonox.execute("startGame")
+            orxonox.execute("startGame " .. level:getXMLFilename())
             hideAllMenuSheets()
         end

code/trunk/src/libraries/core/GUIManager.cc

@@ -62 +62 @@
 #include "Core.h"
 #include "CoreIncludes.h"
+#include "Game.h"
 #include "GraphicsManager.h"
 #include "LuaState.h"
@@ -522 +523 @@
             this->mouseLeft();
     }
+
 }

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -51 +51 @@
     DeclareGameState(GSLevel, "level", false, false);
 
+    static const std::string __CC_startMainMenu_name = "startMainMenu";
+    static const std::string __CC_changeGame_name = "changeGame";
+
+    SetConsoleCommand(__CC_startMainMenu_name, &GSLevel::startMainMenu).deactivate();
+    SetConsoleCommand(__CC_changeGame_name, &GSLevel::changeGame).defaultValues(BLANKSTRING).deactivate();
+
     GSLevel::GSLevel(const GameStateInfo& info)
         : GameState(info)
@@ -94 +100 @@
             // connect the HumanPlayer to the game
             PlayerManager::getInstance().clientConnected(0);
-        }
+
+            ModifyConsoleCommand(__CC_startMainMenu_name).activate();
+        }
+
+        if (GameMode::isStandalone())
+            ModifyConsoleCommand(__CC_changeGame_name).activate();
     }
 
@@ -121 +132 @@
             InputManager::getInstance().destroyState("guiKeysOnly");
             InputManager::getInstance().destroyState("guiMouseOnly");
-        }
+
+            ModifyConsoleCommand(__CC_startMainMenu_name  ).deactivate();
+        }
+
+        if (GameMode::isStandalone())
+            ModifyConsoleCommand(__CC_changeGame_name).deactivate();
     }
 
@@ -166 +182 @@
             COUT(3) << " Try harder!" << std::endl;
     }
+
+    /**
+    @brief
+        Starts the MainMenu.
+    */
+    /*static*/ void GSLevel::startMainMenu(void)
+    {
+        // HACK
+        Game::getInstance().popState();
+        Game::getInstance().popState();
+    }
+
+    /**
+    @brief
+        Terminates the current game and starts a new game.
+    @param level
+        The filename of the level to be started.
+    */
+    /*static*/ void GSLevel::changeGame(const std::string& level)
+    {
+        if(level != BLANKSTRING)
+            LevelManager::getInstance().setDefaultLevel(level);
+
+        // HACK
+        Game::getInstance().popState();
+        Game::getInstance().popState();
+        Game::getInstance().requestStates("standalone, level");
+    }
 }

code/trunk/src/orxonox/gamestates/GSLevel.h

@@ -49 +49 @@
         void update(const Clock& time);
 
+        static void startMainMenu(void); //!< Starts the MainMenu
+        static void changeGame(const std::string& level); //!< Terminates the current game and starts a new game.
+
     protected:
         void loadLevel();

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -31 +31 @@
 #include <OgreSceneManager.h>
 
-#include "core/input/KeyBinderManager.h"
-#include "core/Game.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
+#include "core/Game.h"
 #include "core/GraphicsManager.h"
 #include "core/GUIManager.h"
 #include "core/command/ConsoleCommand.h"
+#include "core/input/KeyBinderManager.h"
+#include "network/Client.h"
+#include "util/StringUtils.h"
+#include "LevelManager.h"
 #include "Scene.h"
 #include "sound/AmbientSound.h"
@@ -52 +55 @@
     static const std::string __CC_startClient_name          = "startClient";
     static const std::string __CC_startDedicated_name       = "startDedicated";
-    static const std::string __CC_startMainMenu_name        = "startMainMenu";
     static const std::string __CC_setMainMenuSoundPath_name = "setMMSoundPath";
 
-    SetConsoleCommand(__CC_startStandalone_name,      &GSMainMenu::startStandalone).deactivate();
-    SetConsoleCommand(__CC_startServer_name,          &GSMainMenu::startServer    ).deactivate();
-    SetConsoleCommand(__CC_startClient_name,          &GSMainMenu::startClient    ).deactivate();
-    SetConsoleCommand(__CC_startDedicated_name,       &GSMainMenu::startDedicated ).deactivate();
-    SetConsoleCommand(__CC_startMainMenu_name,        &GSMainMenu::startMainMenu  ).deactivate();
+    SetConsoleCommand(__CC_startStandalone_name,      &GSMainMenu::startStandalone).defaultValues(BLANKSTRING).deactivate();
+    SetConsoleCommand(__CC_startServer_name,          &GSMainMenu::startServer    ).defaultValues(BLANKSTRING).deactivate();
+    SetConsoleCommand(__CC_startClient_name,          &GSMainMenu::startClient    ).defaultValues(BLANKSTRING).deactivate();
+    SetConsoleCommand(__CC_startDedicated_name,       &GSMainMenu::startDedicated ).defaultValues(BLANKSTRING).deactivate();
     SetConsoleCommand(__CC_setMainMenuSoundPath_name, &GSMainMenu::setMainMenuSoundPath).hide();
 
@@ -106 +107 @@
         ModifyConsoleCommand(__CC_startClient_name    ).activate();
         ModifyConsoleCommand(__CC_startDedicated_name ).activate();
-        ModifyConsoleCommand(__CC_startMainMenu_name  ).activate();
         ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(this);
 
@@ -138 +138 @@
         ModifyConsoleCommand(__CC_startClient_name    ).deactivate();
         ModifyConsoleCommand(__CC_startDedicated_name ).deactivate();
-        ModifyConsoleCommand(__CC_startMainMenu_name  ).deactivate();
         ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(0);
     }
@@ -171 +170 @@
     }
 
-    void GSMainMenu::startStandalone()
-    {
-        // HACK - HACK
+    /**
+    @brief
+        Start a level in standalone mode.
+    @param level
+        The filename of the level to be started. If empty, the default level is started.
+    */
+    void GSMainMenu::startStandalone(const std::string& level)
+    {
+        if(level != BLANKSTRING)
+            LevelManager::getInstance().setDefaultLevel(level);
+
+        // HACK
         Game::getInstance().popState();
         Game::getInstance().requestStates("standalone, level");
     }
 
-    void GSMainMenu::startServer()
-    {
-        // HACK - HACK
+    /**
+    @brief
+        Start a level in server mode.
+    @param level
+        The filename of the level to be started. If empty, the default level is started.
+    */
+    void GSMainMenu::startServer(const std::string& level)
+    {
+        if(level != BLANKSTRING)
+            LevelManager::getInstance().setDefaultLevel(level);
+
+        // HACK
         Game::getInstance().popState();
         Game::getInstance().requestStates("server, level");
     }
 
-    void GSMainMenu::startClient()
-    {
-        // HACK - HACK
+    /**
+    @brief
+        Connect to a game as client.
+    @param destination
+        The destination to connect to. If empty, the client connects to the default destination.
+    */
+    void GSMainMenu::startClient(const std::string& destination)
+    {
+        if(destination != BLANKSTRING)
+            Client::getInstance()->setDestination(destination, NETWORK_PORT);
+
+        // HACK
         Game::getInstance().popState();
         Game::getInstance().requestStates("client, level");
     }
 
-    void GSMainMenu::startDedicated()
-    {
-        // HACK - HACK
+    /**
+    @brief
+        Start a level in dedicated mode.
+    @param level
+        The filename of the level to be started. If empty, the default level is started.
+    */
+    void GSMainMenu::startDedicated(const std::string& level)
+    {
+        if(level != BLANKSTRING)
+            LevelManager::getInstance().setDefaultLevel(level);
+
+        // HACK
         Game::getInstance().popState();
         Game::getInstance().popState();
         Game::getInstance().requestStates("server, level");
     }
-    void GSMainMenu::startMainMenu()
-    {
-        // HACK - HACK
-        Game::getInstance().popState();
-        Game::getInstance().popState();
-        Game::getInstance().requestStates("mainmenu");
-    }
+
 }

code/trunk/src/orxonox/gamestates/GSMainMenu.h

@@ -53 +53 @@
         void setMainMenuSoundPath(const std::string& path);
 
-        static void startStandalone();
-        static void startServer();
-        static void startClient();
-        static void startDedicated();
-        static void startMainMenu();
+        static void startStandalone(const std::string& level = BLANKSTRING); //!< Start a level in standalone mode.
+        static void startServer(const std::string& level = BLANKSTRING); //!< Start a level in server mode.
+        static void startClient(const std::string& destination = BLANKSTRING); //!< Connect to a game as client.
+        static void startDedicated(const std::string& level = BLANKSTRING); //!< Start a level in dedicated mode.
         static void startIOConsole();