TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 20:35:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

1
Templates/BaseGame/game/data/ui/UI.cs
View file

@ -66,7 +66,6 @@ function UI::create( %this )
%dbList = new ArrayObject(LevelFilesList);
loadStartup();
//Canvas.pushDialog(MainMenuGui);
}
function Game::destroy( %this )

2
Templates/BaseGame/game/data/ui/scripts/guis/loadingGui.gui
View file

@ -27,7 +27,7 @@
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
command = "disconnect();\nCanvas.setContent(MainMenuGui);";
command = "disconnect();\nCanvas.setContent(ProjectSettings.value(\"UI/mainMenuName\"));";
accelerator = "escape";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";

4
Templates/BaseGame/game/data/ui/scripts/startupGui.cs
View file

@ -144,7 +144,9 @@ function StartupGui::onDone(%this)
//BlankGui.delete();
//flushTextureCache();
Canvas.setContent(MainMenuGui);
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Canvas.setContent( %mainMenuGUI );
}
else
{