diff --git a/Templates/Empty/game/core/art/gui/chooseLevelDlg.gui b/Templates/Empty/game/art/gui/chooseLevelDlg.gui similarity index 98% rename from Templates/Empty/game/core/art/gui/chooseLevelDlg.gui rename to Templates/Empty/game/art/gui/chooseLevelDlg.gui index db5336318..747529cb4 100644 --- a/Templates/Empty/game/core/art/gui/chooseLevelDlg.gui +++ b/Templates/Empty/game/art/gui/chooseLevelDlg.gui @@ -61,7 +61,7 @@ Visible = "1"; tooltipprofile = "GuiToolTipProfile"; hovertime = "1000"; - bitmap = "./images/no-preview"; + bitmap = "./no-preview"; wrap = "0"; }; @@ -192,7 +192,7 @@ Visible = "1"; tooltipprofile = "GuiToolTipProfile"; hovertime = "1000"; - bitmap = "core/art/gui/images/previous-button"; + bitmap = "art/gui/previous-button"; wrap = "0"; command = "ChooseLevelWindow.previousPreviews();"; }; @@ -222,7 +222,7 @@ Visible = "1"; tooltipprofile = "GuiToolTipProfile"; hovertime = "1000"; - bitmap = "core/art/gui/images/next-button"; + bitmap = "art/gui/next-button"; wrap = "0"; command = "ChooseLevelWindow.nextPreviews();"; }; diff --git a/Templates/Empty/game/core/art/gui/loadingGui.gui b/Templates/Empty/game/art/gui/loadingGui.gui similarity index 100% rename from Templates/Empty/game/core/art/gui/loadingGui.gui rename to Templates/Empty/game/art/gui/loadingGui.gui diff --git a/Templates/Empty/game/core/art/gui/images/next-button_d.png b/Templates/Empty/game/art/gui/next-button_d.png similarity index 100% rename from Templates/Empty/game/core/art/gui/images/next-button_d.png rename to Templates/Empty/game/art/gui/next-button_d.png diff --git a/Templates/Empty/game/core/art/gui/images/next-button_h.png b/Templates/Empty/game/art/gui/next-button_h.png similarity index 100% rename from Templates/Empty/game/core/art/gui/images/next-button_h.png rename to Templates/Empty/game/art/gui/next-button_h.png diff --git a/Templates/Empty/game/core/art/gui/images/next-button_n.png b/Templates/Empty/game/art/gui/next-button_n.png similarity index 100% rename from Templates/Empty/game/core/art/gui/images/next-button_n.png rename to Templates/Empty/game/art/gui/next-button_n.png diff --git a/Templates/Empty/game/core/art/gui/images/no-preview.png b/Templates/Empty/game/art/gui/no-preview.png similarity index 100% rename from Templates/Empty/game/core/art/gui/images/no-preview.png rename to Templates/Empty/game/art/gui/no-preview.png diff --git a/Templates/Empty/game/core/art/gui/optionsDlg.gui b/Templates/Empty/game/art/gui/optionsDlg.gui similarity index 100% rename from Templates/Empty/game/core/art/gui/optionsDlg.gui rename to Templates/Empty/game/art/gui/optionsDlg.gui diff --git a/Templates/Empty/game/core/art/gui/images/previous-button_d.png b/Templates/Empty/game/art/gui/previous-button_d.png similarity index 100% rename from Templates/Empty/game/core/art/gui/images/previous-button_d.png rename to Templates/Empty/game/art/gui/previous-button_d.png diff --git a/Templates/Empty/game/core/art/gui/images/previous-button_h.png b/Templates/Empty/game/art/gui/previous-button_h.png similarity index 100% rename from Templates/Empty/game/core/art/gui/images/previous-button_h.png rename to Templates/Empty/game/art/gui/previous-button_h.png diff --git a/Templates/Empty/game/core/art/gui/images/previous-button_n.png b/Templates/Empty/game/art/gui/previous-button_n.png similarity index 100% rename from Templates/Empty/game/core/art/gui/images/previous-button_n.png rename to Templates/Empty/game/art/gui/previous-button_n.png diff --git a/Templates/Empty/game/core/art/gui/remapDlg.gui b/Templates/Empty/game/art/gui/remapDlg.gui similarity index 100% rename from Templates/Empty/game/core/art/gui/remapDlg.gui rename to Templates/Empty/game/art/gui/remapDlg.gui diff --git a/Templates/Empty/game/core/main.cs b/Templates/Empty/game/core/main.cs index f8ff3e8f1..3e264c6aa 100644 --- a/Templates/Empty/game/core/main.cs +++ b/Templates/Empty/game/core/main.cs @@ -82,16 +82,7 @@ function onStart() exec("./scripts/gui/messageBoxes/messageBox.ed.cs"); exec("./art/gui/customProfiles.cs"); - - // Level Chooser GUI - exec("./art/gui/chooseLevelDlg.gui"); - exec("./scripts/gui/chooseLevelDlg.cs"); - exec("./scripts/gui/optionsDlg.cs"); - exec("./art/gui/optionsDlg.gui"); - exec("./scripts/gui/loadingGui.cs"); - exec("./art/gui/loadingGui.gui"); - echo(" % - Initialized Core"); } diff --git a/Templates/Empty/game/core/scripts/client/core.cs b/Templates/Empty/game/core/scripts/client/core.cs index fef2df7d2..2213d982a 100644 --- a/Templates/Empty/game/core/scripts/client/core.cs +++ b/Templates/Empty/game/core/scripts/client/core.cs @@ -67,7 +67,6 @@ function initializeCore() startFileChangeNotifications(); // Core Guis. - exec("~/art/gui/remapDlg.gui"); exec("~/art/gui/console.gui"); exec("~/art/gui/consoleVarDlg.gui"); exec("~/art/gui/netGraphGui.gui"); diff --git a/Templates/Empty/game/scripts/client/init.cs b/Templates/Empty/game/scripts/client/init.cs index 6cb3471d7..7de5934df 100644 --- a/Templates/Empty/game/scripts/client/init.cs +++ b/Templates/Empty/game/scripts/client/init.cs @@ -72,10 +72,17 @@ function initClient() // Load up the shell GUIs exec("art/gui/mainMenuGui.gui"); exec("art/gui/StartupGui.gui"); - + exec("art/gui/chooseLevelDlg.gui"); + exec("art/gui/loadingGui.gui"); + exec("art/gui/optionsDlg.gui"); + exec("art/gui/remapDlg.gui"); + // Gui scripts exec("scripts/gui/playGui.cs"); exec("scripts/gui/startupGui.cs"); + exec("scripts/gui/chooseLevelDlg.cs"); + exec("scripts/gui/loadingGui.cs"); + exec("scripts/gui/optionsDlg.cs"); // Client scripts exec("./missionDownload.cs"); diff --git a/Templates/Empty/game/core/scripts/gui/chooseLevelDlg.cs b/Templates/Empty/game/scripts/gui/chooseLevelDlg.cs similarity index 98% rename from Templates/Empty/game/core/scripts/gui/chooseLevelDlg.cs rename to Templates/Empty/game/scripts/gui/chooseLevelDlg.cs index abb8fcc57..1cb60d4d7 100644 --- a/Templates/Empty/game/core/scripts/gui/chooseLevelDlg.cs +++ b/Templates/Empty/game/scripts/gui/chooseLevelDlg.cs @@ -95,7 +95,7 @@ function ChooseLevelDlg::onWake( %this ) %preview = new GuiBitmapButtonCtrl() { internalName = "SmallPreview" @ %i; Extent = "108 81"; - bitmap = "core/art/gui/images/no-preview"; + bitmap = "art/gui/no-preview"; command = "ChooseLevelWindow.previewSelected(ChooseLevelWindow->SmallPreviews->SmallPreview" @ %i @ ");"; }; @@ -240,7 +240,7 @@ function ChooseLevelWindow::previewSelected(%this, %preview) if (isObject(%preview) && %preview.bitmap !$= "") %this->CurrentPreview.setBitmap(%preview.bitmap); else - %this->CurrentPreview.setBitmap("core/art/gui/images/no-preview"); + %this->CurrentPreview.setBitmap("art/gui/no-preview"); // Set the current level name if (isObject(%preview) && %preview.levelName !$= "") diff --git a/Templates/Empty/game/core/scripts/gui/loadingGui.cs b/Templates/Empty/game/scripts/gui/loadingGui.cs similarity index 100% rename from Templates/Empty/game/core/scripts/gui/loadingGui.cs rename to Templates/Empty/game/scripts/gui/loadingGui.cs diff --git a/Templates/Empty/game/core/scripts/gui/optionsDlg.cs b/Templates/Empty/game/scripts/gui/optionsDlg.cs similarity index 100% rename from Templates/Empty/game/core/scripts/gui/optionsDlg.cs rename to Templates/Empty/game/scripts/gui/optionsDlg.cs diff --git a/Templates/Full/game/core/art/gui/chooseLevelDlg.gui b/Templates/Full/game/art/gui/chooseLevelDlg.gui similarity index 98% rename from Templates/Full/game/core/art/gui/chooseLevelDlg.gui rename to Templates/Full/game/art/gui/chooseLevelDlg.gui index db5336318..747529cb4 100644 --- a/Templates/Full/game/core/art/gui/chooseLevelDlg.gui +++ b/Templates/Full/game/art/gui/chooseLevelDlg.gui @@ -61,7 +61,7 @@ Visible = "1"; tooltipprofile = "GuiToolTipProfile"; hovertime = "1000"; - bitmap = "./images/no-preview"; + bitmap = "./no-preview"; wrap = "0"; }; @@ -192,7 +192,7 @@ Visible = "1"; tooltipprofile = "GuiToolTipProfile"; hovertime = "1000"; - bitmap = "core/art/gui/images/previous-button"; + bitmap = "art/gui/previous-button"; wrap = "0"; command = "ChooseLevelWindow.previousPreviews();"; }; @@ -222,7 +222,7 @@ Visible = "1"; tooltipprofile = "GuiToolTipProfile"; hovertime = "1000"; - bitmap = "core/art/gui/images/next-button"; + bitmap = "art/gui/next-button"; wrap = "0"; command = "ChooseLevelWindow.nextPreviews();"; }; diff --git a/Templates/Full/game/core/art/gui/loadingGui.gui b/Templates/Full/game/art/gui/loadingGui.gui similarity index 100% rename from Templates/Full/game/core/art/gui/loadingGui.gui rename to Templates/Full/game/art/gui/loadingGui.gui diff --git a/Templates/Full/game/core/art/gui/images/next-button_d.png b/Templates/Full/game/art/gui/next-button_d.png similarity index 100% rename from Templates/Full/game/core/art/gui/images/next-button_d.png rename to Templates/Full/game/art/gui/next-button_d.png diff --git a/Templates/Full/game/core/art/gui/images/next-button_h.png b/Templates/Full/game/art/gui/next-button_h.png similarity index 100% rename from Templates/Full/game/core/art/gui/images/next-button_h.png rename to Templates/Full/game/art/gui/next-button_h.png diff --git a/Templates/Full/game/core/art/gui/images/next-button_n.png b/Templates/Full/game/art/gui/next-button_n.png similarity index 100% rename from Templates/Full/game/core/art/gui/images/next-button_n.png rename to Templates/Full/game/art/gui/next-button_n.png diff --git a/Templates/Full/game/core/art/gui/optionsDlg.gui b/Templates/Full/game/art/gui/optionsDlg.gui similarity index 100% rename from Templates/Full/game/core/art/gui/optionsDlg.gui rename to Templates/Full/game/art/gui/optionsDlg.gui diff --git a/Templates/Full/game/core/art/gui/images/previous-button_d.png b/Templates/Full/game/art/gui/previous-button_d.png similarity index 100% rename from Templates/Full/game/core/art/gui/images/previous-button_d.png rename to Templates/Full/game/art/gui/previous-button_d.png diff --git a/Templates/Full/game/core/art/gui/images/previous-button_h.png b/Templates/Full/game/art/gui/previous-button_h.png similarity index 100% rename from Templates/Full/game/core/art/gui/images/previous-button_h.png rename to Templates/Full/game/art/gui/previous-button_h.png diff --git a/Templates/Full/game/core/art/gui/images/previous-button_n.png b/Templates/Full/game/art/gui/previous-button_n.png similarity index 100% rename from Templates/Full/game/core/art/gui/images/previous-button_n.png rename to Templates/Full/game/art/gui/previous-button_n.png diff --git a/Templates/Full/game/core/art/gui/remapDlg.gui b/Templates/Full/game/art/gui/remapDlg.gui similarity index 100% rename from Templates/Full/game/core/art/gui/remapDlg.gui rename to Templates/Full/game/art/gui/remapDlg.gui diff --git a/Templates/Full/game/core/art/gui/images/no-preview.png b/Templates/Full/game/core/art/gui/images/no-preview.png deleted file mode 100644 index fccdc858b..000000000 Binary files a/Templates/Full/game/core/art/gui/images/no-preview.png and /dev/null differ diff --git a/Templates/Full/game/core/main.cs b/Templates/Full/game/core/main.cs index f8ff3e8f1..3e264c6aa 100644 --- a/Templates/Full/game/core/main.cs +++ b/Templates/Full/game/core/main.cs @@ -82,16 +82,7 @@ function onStart() exec("./scripts/gui/messageBoxes/messageBox.ed.cs"); exec("./art/gui/customProfiles.cs"); - - // Level Chooser GUI - exec("./art/gui/chooseLevelDlg.gui"); - exec("./scripts/gui/chooseLevelDlg.cs"); - exec("./scripts/gui/optionsDlg.cs"); - exec("./art/gui/optionsDlg.gui"); - exec("./scripts/gui/loadingGui.cs"); - exec("./art/gui/loadingGui.gui"); - echo(" % - Initialized Core"); } diff --git a/Templates/Full/game/core/scripts/client/core.cs b/Templates/Full/game/core/scripts/client/core.cs index fef2df7d2..2213d982a 100644 --- a/Templates/Full/game/core/scripts/client/core.cs +++ b/Templates/Full/game/core/scripts/client/core.cs @@ -67,7 +67,6 @@ function initializeCore() startFileChangeNotifications(); // Core Guis. - exec("~/art/gui/remapDlg.gui"); exec("~/art/gui/console.gui"); exec("~/art/gui/consoleVarDlg.gui"); exec("~/art/gui/netGraphGui.gui"); diff --git a/Templates/Full/game/scripts/client/init.cs b/Templates/Full/game/scripts/client/init.cs index 2358d090f..ef006e5c5 100644 --- a/Templates/Full/game/scripts/client/init.cs +++ b/Templates/Full/game/scripts/client/init.cs @@ -81,13 +81,20 @@ function initClient() exec("art/gui/joinServerDlg.gui"); exec("art/gui/endGameGui.gui"); exec("art/gui/StartupGui.gui"); - + exec("art/gui/chooseLevelDlg.gui"); + exec("art/gui/loadingGui.gui"); + exec("art/gui/optionsDlg.gui"); + exec("art/gui/remapDlg.gui"); + // Gui scripts exec("./playerList.cs"); exec("./chatHud.cs"); exec("./messageHud.cs"); exec("scripts/gui/playGui.cs"); exec("scripts/gui/startupGui.cs"); + exec("scripts/gui/chooseLevelDlg.cs"); + exec("scripts/gui/loadingGui.cs"); + exec("scripts/gui/optionsDlg.cs"); // Client scripts exec("./client.cs"); diff --git a/Templates/Full/game/core/scripts/gui/chooseLevelDlg.cs b/Templates/Full/game/scripts/gui/chooseLevelDlg.cs similarity index 98% rename from Templates/Full/game/core/scripts/gui/chooseLevelDlg.cs rename to Templates/Full/game/scripts/gui/chooseLevelDlg.cs index abb8fcc57..1cb60d4d7 100644 --- a/Templates/Full/game/core/scripts/gui/chooseLevelDlg.cs +++ b/Templates/Full/game/scripts/gui/chooseLevelDlg.cs @@ -95,7 +95,7 @@ function ChooseLevelDlg::onWake( %this ) %preview = new GuiBitmapButtonCtrl() { internalName = "SmallPreview" @ %i; Extent = "108 81"; - bitmap = "core/art/gui/images/no-preview"; + bitmap = "art/gui/no-preview"; command = "ChooseLevelWindow.previewSelected(ChooseLevelWindow->SmallPreviews->SmallPreview" @ %i @ ");"; }; @@ -240,7 +240,7 @@ function ChooseLevelWindow::previewSelected(%this, %preview) if (isObject(%preview) && %preview.bitmap !$= "") %this->CurrentPreview.setBitmap(%preview.bitmap); else - %this->CurrentPreview.setBitmap("core/art/gui/images/no-preview"); + %this->CurrentPreview.setBitmap("art/gui/no-preview"); // Set the current level name if (isObject(%preview) && %preview.levelName !$= "") diff --git a/Templates/Full/game/core/scripts/gui/loadingGui.cs b/Templates/Full/game/scripts/gui/loadingGui.cs similarity index 100% rename from Templates/Full/game/core/scripts/gui/loadingGui.cs rename to Templates/Full/game/scripts/gui/loadingGui.cs diff --git a/Templates/Full/game/core/scripts/gui/optionsDlg.cs b/Templates/Full/game/scripts/gui/optionsDlg.cs similarity index 100% rename from Templates/Full/game/core/scripts/gui/optionsDlg.cs rename to Templates/Full/game/scripts/gui/optionsDlg.cs