From 67de30b0e1465e98b1c2d1add6104cacc43b37f0 Mon Sep 17 00:00:00 2001 From: thecelloman Date: Tue, 9 Apr 2013 06:01:53 -0400 Subject: [PATCH] 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 --- .../Empty/game/art/gui/customProfiles.cs | 26 +++++++++++++++++++ Templates/Empty/game/core/main.cs | 2 -- Templates/Empty/game/scripts/client/init.cs | 5 ++++ Templates/Full/game/art/gui/customProfiles.cs | 7 ++--- Templates/Full/game/core/main.cs | 2 -- Templates/Full/game/scripts/client/init.cs | 7 +++-- 6 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 Templates/Empty/game/art/gui/customProfiles.cs diff --git a/Templates/Empty/game/art/gui/customProfiles.cs b/Templates/Empty/game/art/gui/customProfiles.cs new file mode 100644 index 000000000..235c665e6 --- /dev/null +++ b/Templates/Empty/game/art/gui/customProfiles.cs @@ -0,0 +1,26 @@ +//----------------------------------------------------------------------------- +// 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 +// ---------------------------------------------------------------------------- diff --git a/Templates/Empty/game/core/main.cs b/Templates/Empty/game/core/main.cs index 3e264c6aa..3adaf5a56 100644 --- a/Templates/Empty/game/core/main.cs +++ b/Templates/Empty/game/core/main.cs @@ -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"); } diff --git a/Templates/Empty/game/scripts/client/init.cs b/Templates/Empty/game/scripts/client/init.cs index 7de5934df..4698b8c47 100644 --- a/Templates/Empty/game/scripts/client/init.cs +++ b/Templates/Empty/game/scripts/client/init.cs @@ -60,6 +60,11 @@ function initClient() $Client::GameTypeQuery = $appName; $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 initBaseClient(); diff --git a/Templates/Full/game/art/gui/customProfiles.cs b/Templates/Full/game/art/gui/customProfiles.cs index 02fd14721..235c665e6 100644 --- a/Templates/Full/game/art/gui/customProfiles.cs +++ b/Templates/Full/game/art/gui/customProfiles.cs @@ -20,6 +20,7 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// Game specific profiles are located here -//----------------------------------------------------------------------------- \ No newline at end of file +// ---------------------------------------------------------------------------- +// This is the default save location for any GuiProfiles created in the +// Gui Editor +// ---------------------------------------------------------------------------- diff --git a/Templates/Full/game/core/main.cs b/Templates/Full/game/core/main.cs index 3e264c6aa..3adaf5a56 100644 --- a/Templates/Full/game/core/main.cs +++ b/Templates/Full/game/core/main.cs @@ -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"); } diff --git a/Templates/Full/game/scripts/client/init.cs b/Templates/Full/game/scripts/client/init.cs index 83014f7dc..29a10976b 100644 --- a/Templates/Full/game/scripts/client/init.cs +++ b/Templates/Full/game/scripts/client/init.cs @@ -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();