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

Adjusted init'ing logic to defer to project settings for the name of the play gui and mainMenu gui instead of hardcoding them

Browse source
This commit is contained in:
Areloch 2019-08-07 01:27:39 -05:00
parent e6e2ee0d50
commit fee1ceab3c
18 changed files with 151 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -88,7 +88,7 @@
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "Editor.close(\"PlayGui\");";
Command = "Editor.close(ProjectSettings.value(\"UI/playGUIName\"));";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Play Game";
hovertime = "1000";

3
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.cs
View file

@ -1965,7 +1965,8 @@ function EditorGui::handleEscape( %this )
if ( !%result )
{
Editor.close("PlayGui");
%playGUIName = ProjectSettings.value("UI/playGUIName");
Editor.close(%playGUIName);
}
}

8
Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.cs
View file

@ -132,7 +132,8 @@ function toggleEditor(%make)
}
else
{
Editor.close("PlayGui");
%playGUIName = ProjectSettings.value("UI/playGUIName");
Editor.close(%playGUIName);
}
}
else
@ -191,8 +192,9 @@ package EditorDisconnectOverride
{
if ( isObject( Editor ) && Editor.isEditorEnabled() )
{
if (isObject( MainMenuGui ))
Editor.close("MainMenuGui");
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Editor.close( %mainMenuGUI );
}
Parent::disconnect();

5
Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs
View file

@ -115,8 +115,9 @@ function EditorDoExitMission(%saveFirst)
EditorClearDirty();
}
if (isObject( MainMenuGui ))
Editor.close("MainMenuGui");
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Editor.close( %mainMenuGUI );
disconnect();
}

2
Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs
View file

@ -157,7 +157,7 @@ function EditorGui::buildMenus(%this)
%fileMenu.appendItem( "Add FMOD Designer Audio..." TAB "" TAB "AddFMODProjectDlg.show();" );
%fileMenu.appendItem("-");
%fileMenu.appendItem("Play Level" TAB "F11" TAB "Editor.close(\"PlayGui\");");
%fileMenu.appendItem("Play Level" TAB "F11" TAB "Editor.close(ProjectSettings.value(\"UI/playGUIName\"));");
%fileMenu.appendItem("Exit Level" TAB "" TAB "EditorExitMission();");
%fileMenu.appendItem("Quit" TAB %quitShortcut TAB "EditorQuitGame();");