Changeset 6214 for code/branches/presentation2/src/libraries/core/Game.cc

Timestamp:

Dec 2, 2009, 8:41:44 PM (14 years ago)

Author:

scheusso

Message:

a small fix in IOConsole
some changes in GUI-system and preparation for keybindings menu
fix in menu handling

File:

• code/branches/presentation2/src/libraries/core/Game.cc (modified) (2 diffs)

code/branches/presentation2/src/libraries/core/Game.cc

@@ -58 +58 @@
         { Game::getInstance().stop(); }
     SetConsoleCommandShortcutExternAlias(stop_game, "exit");
-    static void key_esc()
-        { Game::getInstance().keyESC(); }
-    SetConsoleCommandShortcutExternAlias(key_esc, "keyESC");
     static void printFPS()
         { COUT(0) << Game::getInstance().getAvgFPS() << std::endl; }
@@ -331 +328 @@
     }
 
-    void Game::keyESC()
-    {
-        if( this->getState("mainMenu") && this->getState("mainMenu")->getActivity().active==true )
-            this->stop();
-        else
-            GUIManager::getInstance().keyESC();
-    }
-
     void Game::stop()
     {