Commit 67de30b0 authored by thecelloman's avatar thecelloman

Correct customProfiles.cs execution.

This removes a duplicate and erroneous attempt to load the customProfiles.cs script.  Also added additional commentary to note that this file is the default save location when using the Gui Editor to create GuiProfiles.
Also fixes a problem where the Empty Template was not loading customProfiles.cs
parent 1ed1a412
//-----------------------------------------------------------------------------
// Copyright (c) 2012 GarageGames, LLC
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// This is the default save location for any GuiProfiles created in the
// Gui Editor
// ----------------------------------------------------------------------------
...@@ -81,8 +81,6 @@ function onStart() ...@@ -81,8 +81,6 @@ function onStart()
exec("./scripts/gui/guiTreeViewCtrl.cs"); exec("./scripts/gui/guiTreeViewCtrl.cs");
exec("./scripts/gui/messageBoxes/messageBox.ed.cs"); exec("./scripts/gui/messageBoxes/messageBox.ed.cs");
exec("./art/gui/customProfiles.cs");
echo(" % - Initialized Core"); echo(" % - Initialized Core");
} }
......
...@@ -60,6 +60,11 @@ function initClient() ...@@ -60,6 +60,11 @@ function initClient()
$Client::GameTypeQuery = $appName; $Client::GameTypeQuery = $appName;
$Client::MissionTypeQuery = "Any"; $Client::MissionTypeQuery = "Any";
// 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/gameProfiles.cs");
exec("art/gui/customProfiles.cs");
// The common module provides basic client functionality // The common module provides basic client functionality
initBaseClient(); initBaseClient();
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Game specific profiles are located here // This is the default save location for any GuiProfiles created in the
//----------------------------------------------------------------------------- // Gui Editor
\ No newline at end of file // ----------------------------------------------------------------------------
...@@ -81,8 +81,6 @@ function onStart() ...@@ -81,8 +81,6 @@ function onStart()
exec("./scripts/gui/guiTreeViewCtrl.cs"); exec("./scripts/gui/guiTreeViewCtrl.cs");
exec("./scripts/gui/messageBoxes/messageBox.ed.cs"); exec("./scripts/gui/messageBoxes/messageBox.ed.cs");
exec("./art/gui/customProfiles.cs");
echo(" % - Initialized Core"); echo(" % - Initialized Core");
} }
......
...@@ -60,8 +60,11 @@ function initClient() ...@@ -60,8 +60,11 @@ function initClient()
$Client::GameTypeQuery = $appName; $Client::GameTypeQuery = $appName;
$Client::MissionTypeQuery = "Any"; $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 // The common module provides basic client functionality
initBaseClient(); initBaseClient();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment