Browse Source

Merge pull request #352 from Azaezel/queueQQ

followup
Brian Roberts 4 years ago
parent
commit
e3ad02eda0

+ 3 - 3
Templates/BaseGame/game/data/ExampleModule/ExampleModule.cs

@@ -33,7 +33,7 @@ function ExampleModule::onDestroy(%this)
 function ExampleModule::initServer(%this)
 {
    //This script contains our ExampleGameMode logic
-   exec("./scripts/ExampleGamemodeScript.cs");
+   %this.queueExec("./scripts/ExampleGamemodeScript.cs");
 }
 
 //This is called when a game session server is actually created so the game may be played. It's called 
@@ -74,13 +74,13 @@ function ExampleModule::initClient(%this)
    
    //client scripts
    //Here, we exec out keybind scripts so the player is able to move when they get into a game
-   exec("./scripts/default.keybinds.cs");
+   %this.queueExec("./scripts/default.keybinds.cs");
    
    %prefPath = getPrefpath();
    if(isFile(%prefPath @ "/keybinds.cs"))
       exec(%prefPath @ "/keybinds.cs");
       
-   exec("./scripts/inputCommands.cs");
+   %this.queueExec("./scripts/inputCommands.cs");
 }
 
 //This is called when a game session client successfuly connects to a game server. 

+ 2 - 2
Templates/BaseGame/game/data/gameUI/gameUI.cs

@@ -15,8 +15,8 @@ function gameUI::onDestroyGameServer(%this){}
 function gameUI::initClient(%this)
 {
    //guis
-   exec("./GUIs/playGui.gui");
-   exec("./GUIs/playGui.cs");
+   %this.queueExec("./GUIs/playGui.gui");
+   %this.queueExec("./GUIs/playGui.cs");
 }
 
 function gameUI::onCreateClientConnection(%this){}

+ 29 - 29
Templates/BaseGame/game/data/ui/UI.cs

@@ -33,52 +33,52 @@ function UI::initClient(%this)
    //%this.queueExec("./datablocks/guiSounds.cs");
    
    //Profiles
-   %this.queueExec("/scripts/profiles.cs");
+   %this.queueExec("./scripts/profiles.cs");
    
    //Now gui files
-   %this.queueExec("/scripts/menuInputButtons.cs");
+   %this.queueExec("./scripts/menuInputButtons.cs");
    
-   %this.queueExec("/guis/mainMenu.cs");
-   %this.queueExec("/guis/mainMenu.gui");
+   %this.queueExec("./guis/mainMenu.cs");
+   %this.queueExec("./guis/mainMenu.gui");
    
-   %this.queueExec("/guis/chooseLevelDlg.cs");
-   %this.queueExec("/guis/chooseLevelDlg.gui");
+   %this.queueExec("./guis/chooseLevelDlg.cs");
+   %this.queueExec("./guis/chooseLevelDlg.gui");
    
-   %this.queueExec("/guis/joinServerMenu.cs");
-   %this.queueExec("/guis/joinServerMenu.gui");
+   %this.queueExec("./guis/joinServerMenu.cs");
+   %this.queueExec("./guis/joinServerMenu.gui");
    
-   %this.queueExec("/guis/loadingGui.gui");
+   %this.queueExec("./guis/loadingGui.gui");
    
-   %this.queueExec("/guis/optionsMenu.cs");
-   %this.queueExec("/guis/optionsMenu.gui");
+   %this.queueExec("./guis/optionsMenu.cs");
+   %this.queueExec("./guis/optionsMenu.gui");
    
-   %this.queueExec("/guis/pauseMenu.cs");
-   %this.queueExec("/guis/pauseMenu.gui");
+   %this.queueExec("./guis/pauseMenu.cs");
+   %this.queueExec("./guis/pauseMenu.gui");
    
-   %this.queueExec("/guis/remapDlg.gui");
-   %this.queueExec("/guis/remapConfirmDlg.gui");
+   %this.queueExec("./guis/remapDlg.gui");
+   %this.queueExec("./guis/remapConfirmDlg.gui");
    
-   %this.queueExec("/guis/profiler.cs");
-   %this.queueExec("/guis/profiler.gui");
+   %this.queueExec("./guis/profiler.cs");
+   %this.queueExec("./guis/profiler.gui");
    
-   %this.queueExec("/guis/netGraphGui.gui");
-   %this.queueExec("/guis/RecordingsDlg.gui");
+   %this.queueExec("./guis/netGraphGui.gui");
+   %this.queueExec("./guis/RecordingsDlg.gui");
    
-   %this.queueExec("/guis/guiMusicPlayer.cs");
-   %this.queueExec("/guis/guiMusicPlayer.gui");
+   %this.queueExec("./guis/guiMusicPlayer.cs");
+   %this.queueExec("./guis/guiMusicPlayer.gui");
    
-   %this.queueExec("/guis/startupGui.cs");
-   %this.queueExec("/guis/startupGui.gui");
+   %this.queueExec("./guis/startupGui.cs");
+   %this.queueExec("./guis/startupGui.gui");
    
    // Load Editor Dialogs
-   %this.queueExec("/guis/messageBoxDlg.gui");
+   %this.queueExec("./guis/messageBoxDlg.gui");
    
    //Load scripts
-   %this.queueExec("/scripts/controlsMenu.cs");
-   %this.queueExec("/scripts/messageBoxes.cs");
-   %this.queueExec("/scripts/help.cs");
-   %this.queueExec("/scripts/cursors.cs");
-   %this.queueExec("/scripts/utility.cs");
+   %this.queueExec("./scripts/controlsMenu.cs");
+   %this.queueExec("./scripts/messageBoxes.cs");
+   %this.queueExec("./scripts/help.cs");
+   %this.queueExec("./scripts/cursors.cs");
+   %this.queueExec("./scripts/utility.cs");
 }
 
 function UI::onCreateClientConnection(%this){}