Explorar o código

template index file review
remove redundant referenes to $TorqueScriptFileExtension. exec and queueExec both handle those internaly.
as pointed out in #511, we were already executing the guimusicpayer.gui in the ut.tscript module via queue. as that case allows folks to bolt a true at the end of the method to override the file-call and replace it with a personalized variant in another module, removed the redundant exec

AzaezelX %!s(int64=4) %!d(string=hai) anos
pai
achega
c640d8823d

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

@@ -33,7 +33,7 @@ function ExampleModule::onDestroy(%this)
 function ExampleModule::initServer(%this)
 {
    //This script contains our ExampleGameMode logic
-   %this.queueExec("./scripts/ExampleGamemodeScript." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/ExampleGamemodeScript");
 }
 
 //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
-   %this.queueExec("./scripts/default.keybinds." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/default.keybinds");
    
    %prefPath = getPrefpath();
    if(isFile(%prefPath @ "/keybinds." @ $TorqueScriptFileExtension))
       exec(%prefPath @ "/keybinds." @ $TorqueScriptFileExtension);
       
-   %this.queueExec("./scripts/inputCommands." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/inputCommands");
 }
 
 //This is called when a game session client successfuly connects to a game server. 

+ 1 - 1
Templates/BaseGame/game/data/gameUI/gameUI.tscript

@@ -16,7 +16,7 @@ function gameUI::initClient(%this)
 {
    //guis
    %this.queueExec("./GUIs/playGui.gui");
-   %this.queueExec("./GUIs/playGui." @ $TorqueScriptFileExtension);
+   %this.queueExec("./GUIs/playGui");
 }
 
 function gameUI::onCreateClientConnection(%this){}

+ 16 - 16
Templates/BaseGame/game/data/ui/UI.tscript

@@ -30,55 +30,55 @@ function UI::initClient(%this)
 {
    //Load UI stuff
    //we need to load this because some of the menu profiles use the sounds here
-   //%this.queueExec("./datablocks/guiSounds." @ $TorqueScriptFileExtension);
+   //%this.queueExec("./datablocks/guiSounds");
    
    //Profiles
-   %this.queueExec("./scripts/profiles." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/profiles");
    
    //Now gui files
-   %this.queueExec("./scripts/menuInputButtons." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/menuInputButtons");
    
-   %this.queueExec("./guis/mainMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/mainMenu");
    %this.queueExec("./guis/mainMenu.gui");
    
-   %this.queueExec("./guis/chooseLevelDlg." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/chooseLevelDlg");
    %this.queueExec("./guis/chooseLevelDlg.gui");
    
-   %this.queueExec("./guis/joinServerMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/joinServerMenu");
    %this.queueExec("./guis/joinServerMenu.gui");
    
    %this.queueExec("./guis/loadingGui.gui");
    
-   %this.queueExec("./guis/optionsMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/optionsMenu");
    %this.queueExec("./guis/optionsMenu.gui");
    
-   %this.queueExec("./guis/pauseMenu." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/pauseMenu");
    %this.queueExec("./guis/pauseMenu.gui");
    
    %this.queueExec("./guis/remapDlg.gui");
    %this.queueExec("./guis/remapConfirmDlg.gui");
    
-   %this.queueExec("./guis/profiler." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/profiler");
    %this.queueExec("./guis/profiler.gui");
    
    %this.queueExec("./guis/netGraphGui.gui");
    %this.queueExec("./guis/RecordingsDlg.gui");
    
-   %this.queueExec("./guis/guiMusicPlayer." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/guiMusicPlayer");
    %this.queueExec("./guis/guiMusicPlayer.gui");
    
-   %this.queueExec("./guis/startupGui." @ $TorqueScriptFileExtension);
+   %this.queueExec("./guis/startupGui");
    %this.queueExec("./guis/startupGui.gui");
    
    // Load Editor Dialogs
    %this.queueExec("./guis/messageBoxDlg.gui");
    
    //Load scripts
-   %this.queueExec("./scripts/controlsMenu." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/messageBoxes." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/help." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/cursors." @ $TorqueScriptFileExtension);
-   %this.queueExec("./scripts/utility." @ $TorqueScriptFileExtension);
+   %this.queueExec("./scripts/controlsMenu");
+   %this.queueExec("./scripts/messageBoxes");
+   %this.queueExec("./scripts/help");
+   %this.queueExec("./scripts/cursors");
+   %this.queueExec("./scripts/utility");
 }
 
 function UI::onCreateClientConnection(%this){}

+ 0 - 7
Templates/BaseGame/game/data/ui/guis/guiMusicPlayer.tscript

@@ -21,13 +21,6 @@
 //-----------------------------------------------------------------------------
 
 // A very simple music player.
-
-//---------------------------------------------------------------------------------------------
-// Prerequisites.
-
-if( !isObject( GuiMusicPlayer ) )
-   exec( "./guiMusicPlayer.gui" );
-
 //---------------------------------------------------------------------------------------------
 // Preferences.