Merge pull request #264 from thecelloman/gameguisarenotcore

Relocate game specific GUIs  out of the "core"

Templates/Empty/game/core/art/gui/chooseLevelDlg.gui → 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();";
       };

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");
 }
 

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");

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");

Templates/Empty/game/core/scripts/gui/chooseLevelDlg.cs → 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 !$= "")

Templates/Full/game/core/art/gui/chooseLevelDlg.gui → 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();";
       };

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");
 }
 

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");

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");

Templates/Full/game/core/scripts/gui/chooseLevelDlg.cs → 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 !$= "")