TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #396 from Areloch/EditorAwarePauseMenu

Browse source 
Adds handling so the pause menu has a button to exit the editor as a quick shortcut
This commit is contained in:
Brian Roberts 2020-12-03 21:14:22 -06:00 • committed by GitHub
commit eb51b8a4b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Templates/BaseGame/game/data/ui/guis/pauseMenu.cs
View file

@ -1,10 +1,3 @@
function PauseMenuList::onAdd(%this)
{
%this.addRow("Options", "openPauseMenuOptions", -1, -30);
%this.addRow("Exit to Menu", "pauseMenuExitToMenu", -1, -30);
%this.addRow("Exit to Desktop", "pauseMenuExitToDesktop", -1, -30);
}
function PauseMenu::onWake(%this) function PauseMenu::onWake(%this)
{ {
if($Server::ServerType $= "SinglePlayer") if($Server::ServerType $= "SinglePlayer")
@ -17,6 +10,17 @@ function PauseMenu::onWake(%this)
PauseMenuList.hidden = false; PauseMenuList.hidden = false;
PauseMenuList.setFirstResponder(); PauseMenuList.setFirstResponder();
PauseButtonHolder.setActive(); PauseButtonHolder.setActive();
PauseMenuList.clearRows();
if($Tools::loaded && EditorIsActive())
{
PauseMenuList.addRow("Exit Editor", "fastLoadWorldEdit", -1, -30);
}
PauseMenuList.addRow("Options", "openPauseMenuOptions", -1, -30);
PauseMenuList.addRow("Exit to Menu", "pauseMenuExitToMenu", -1, -30);
PauseMenuList.addRow("Exit to Desktop", "pauseMenuExitToDesktop", -1, -30);
} }

2
Templates/BaseGame/game/tools/main.cs
View file

@ -257,7 +257,7 @@ function EditorCreateFakeGameSession(%fileName)
function fastLoadWorldEdit(%val) function fastLoadWorldEdit(%val)
{ {
if(%val) if(%val || %val $= "")
{ {
if(!$Tools::loaded) if(!$Tools::loaded)
{ {