Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 20, 2009, 4:55:40 PM (15 years ago)
Author:
rgrieder
Message:

Merged console branch back to trunk.

Location:
code/trunk
Files:
4 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/orxonox/gamestates/CMakeLists.txt

    r5929 r6105  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    22  GSClient.cc
    3   GSDedicated.cc
    4   GSDedicatedClient.cc
    53  GSGraphics.cc
    6   GSIOConsole.cc
    74  GSLevel.cc
    85  GSMainMenu.cc
  • code/trunk/src/orxonox/gamestates/GSClient.cc

    r6021 r6105  
    2929#include "GSClient.h"
    3030
    31 #include "util/Clock.h"
     31#include "util/Debug.h"
    3232#include "util/Exception.h"
    3333#include "core/CommandLineParser.h"
     
    3838namespace orxonox
    3939{
    40     DeclareGameState(GSClient, "client", false, true);
     40    DeclareGameState(GSClient, "client", false, false);
    4141
    4242    SetCommandLineArgument(ip, "127.0.0.1").information("Sever IP as string in the form #.#.#.#");
  • code/trunk/src/orxonox/gamestates/GSMainMenu.cc

    r5929 r6105  
    9191        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startDedicated), "startDedicated"));
    9292        CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startMainMenu), "startMainMenu"));
    93         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startIOConsole), "startIOConsole"));
    9493
    9594        KeyBinderManager::getInstance().setToDefault();
     
    146145        Game::getInstance().popState();
    147146        Game::getInstance().popState();
    148         Game::getInstance().requestStates("dedicated, level");
     147        Game::getInstance().requestStates("server, level");
    149148    }
    150149    void GSMainMenu::startMainMenu()
     
    155154        Game::getInstance().requestStates("mainmenu");
    156155    }
    157     void GSMainMenu::startIOConsole()
    158     {
    159         // HACK - HACK
    160         Game::getInstance().popState();
    161         Game::getInstance().popState();
    162         Game::getInstance().requestStates("ioConsole");
    163     }
    164156}
  • code/trunk/src/orxonox/gamestates/GSRoot.cc

    r5929 r6105  
    9090    void GSRoot::update(const Clock& time)
    9191    {
    92         if (this->getActivity().topState)
    93         {
    94             // This state can not 'survive' on its own.
    95             // Load a user interface therefore
    96             Game::getInstance().requestState("ioConsole");
    97         }
    98 
    9992        for (ObjectList<Timer>::iterator it = ObjectList<Timer>::begin(); it; )
    10093            (it++)->tick(time);
  • code/trunk/src/orxonox/gamestates/GSServer.cc

    r6021 r6105  
    3737namespace orxonox
    3838{
    39     DeclareGameState(GSServer, "server", false, true);
     39    DeclareGameState(GSServer, "server", false, false);
    4040
    4141    SetCommandLineArgument(port, 55556).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
Note: See TracChangeset for help on using the changeset viewer.