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

Merge pull request #322 from thecelloman/fixcustomprofiles

Browse source 
Correct customProfiles.cs execution.
This commit is contained in:
SilentMike 2013-04-09 10:40:33 -07:00
commit 5fc1316869
6 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/Full/game/art/gui/customProfiles.cs
View file

@ -20,6 +20,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// Game specific profiles are located here
//-----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// This is the default save location for any GuiProfiles created in the
// Gui Editor
// ----------------------------------------------------------------------------

2
Templates/Full/game/core/main.cs
View file

@ -81,8 +81,6 @@ function onStart()
exec("./scripts/gui/guiTreeViewCtrl.cs");
exec("./scripts/gui/messageBoxes/messageBox.ed.cs");
exec("./art/gui/customProfiles.cs");
echo(" % - Initialized Core");
}

7
Templates/Full/game/scripts/client/init.cs
View file

@ -60,8 +60,11 @@ function initClient()
$Client::GameTypeQuery = $appName;
$Client::MissionTypeQuery = "Any";
exec("art/gui/customProfiles.cs"); // override the base profiles if necessary
// These should be game specific GuiProfiles. Custom profiles are saved out
// from the Gui Editor. Either of these may override any that already exist.
exec("art/gui/defaultGameProfiles.cs");
exec("art/gui/customProfiles.cs");
// The common module provides basic client functionality
initBaseClient();