TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1291 from Areloch/RemoveExtraPauseMenuRefs

Browse source 
Removes old remaining refs to PauseMenu and associated input cleanups
This commit is contained in:
Brian Roberts 2024-07-23 14:45:52 -05:00 • committed by GitHub
commit d7c59b2898
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/data/ExampleModule/scripts/client/defaultKeybinds.tscript
View file

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

13
Templates/BaseGame/game/data/UI/UI.tscript
View file

@ -81,11 +81,20 @@ function UI::initClient(%this)
if(isToolBuild()) if(isToolBuild())
%this.queueExec("./tools/creator.tscript"); %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) function UI::registerGameMenus(%this, %menusArrayObj)
{ {

15
Templates/BaseGame/game/data/UI/guis/GameMenu.tscript
View file

@ -107,21 +107,6 @@ function GameMenu::openGameMenu(%this, %menuName)
%this.syncGui(); %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) function GameMenuPrevMenu(%val)
{ {
if(%val) if(%val)

5
Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.tscript
View file

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