Jelajahi Sumber

Merge pull request #1291 from Areloch/RemoveExtraPauseMenuRefs

Removes old remaining refs to PauseMenu and associated input cleanups
Brian Roberts 1 tahun lalu
induk
melakukan
d7c59b2898

+ 0 - 2
Templates/BaseGame/game/data/ExampleModule/scripts/client/defaultKeybinds.tscript

@@ -29,8 +29,6 @@ addKeyRemap("Jump", "ExampleMoveMap", "gamepad", "jump", "Jump");
 ExampleMoveMap.bind( keyboard, F2, showPlayerList );
 ExampleMoveMap.bind(keyboard, "ctrl h", hideHUDs);
 ExampleMoveMap.bind(keyboard, "alt p", doScreenShotHudless);
-ExampleMoveMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(GameMenu);");
-ExampleMoveMap.bindCmd(gamepad, btn_start, "Canvas.pushDialog(GameMenu);", "" );
 
 //------------------------------------------------------------------------------
 // Movement Keys

+ 11 - 2
Templates/BaseGame/game/data/UI/UI.tscript

@@ -81,11 +81,20 @@ function UI::initClient(%this)
    
    if(isToolBuild())
       %this.queueExec("./tools/creator.tscript");
+      
+   //GameMenu actionmap
+   %this.queueExec("./scripts/defaultKeybinds.tscript");
 }
 
-function UI::onCreateClientConnection(%this){}
+function UI::onCreateClientConnection(%this)
+{
+   GameMenuActionMap.push();
+}
 
-function UI::onDestroyClientConnection(%this){}
+function UI::onDestroyClientConnection(%this)
+{
+   GameMenuActionMap.pop();
+}
 
 function UI::registerGameMenus(%this, %menusArrayObj)
 {

+ 0 - 15
Templates/BaseGame/game/data/UI/guis/GameMenu.tscript

@@ -107,21 +107,6 @@ function GameMenu::openGameMenu(%this, %menuName)
    %this.syncGui();
 }
 
-function openPauseMenuOptions()
-{
-   GameMenu.pushPage(OptionsMenu);
-}
-
-function pauseMenuExitToMenu()
-{
-   MessageBoxOKCancel("Exit?", "Do you wish to exit to the Main Menu?", "escapeFromGame();", "");
-}
-
-function pauseMenuExitToDesktop()
-{
-   MessageBoxOKCancel("Exit?", "Do you wish to exit to the desktop?", "quit();", "");
-}
-
 function GameMenuPrevMenu(%val)
 {
    if(%val)

+ 0 - 5
Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.tscript

@@ -25,11 +25,6 @@ if ( isObject( EditorMap ) )
    
 new ActionMap(EditorMap);
 
-//------------------------------------------------------------------------------
-// Non-remapable binds
-//------------------------------------------------------------------------------
-EditorMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(PauseMenu);");
-
 //------------------------------------------------------------------------------
 // Movement Keys
 //------------------------------------------------------------------------------