TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-10 22:24:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve handling of non-default script filenames

Browse source
This commit is contained in:
Lukas Aldershaab 2021-01-07 12:01:09 +01:00
parent 099dd4f1f3
commit 9ccaa6d3ea
118 changed files with 534 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Templates/BaseGame/game/tools/main.tscript
View file

@ -40,9 +40,9 @@ if(!$Tools::loaded)
//We may need to lean on certain EditorSettings, and specifically default values if the settings.xml
//isn't found
exec("tools/worldEditor/scripts/editorPrefs.ed.tscript");
exec("tools/worldEditor/scripts/editorPrefs.ed." @ $TorqueScriptFileExtension);
exec( "tools/gui/profiles.ed.tscript" );
exec( "tools/gui/profiles.ed." @ $TorqueScriptFileExtension );
exec("tools/gui/EditorLoadingGui.gui");
}
@ -77,14 +77,14 @@ function onStart()
}
// Common GUI stuff.
exec( "./gui/cursors.ed.tscript" );
exec( "./gui/messageBoxes/messageBox.ed.tscript" );
exec( "./editorClasses/gui/panels/navPanelProfiles.ed.tscript" );
exec( "./gui/cursors.ed." @ $TorqueScriptFileExtension );
exec( "./gui/messageBoxes/messageBox.ed." @ $TorqueScriptFileExtension );
exec( "./editorClasses/gui/panels/navPanelProfiles.ed." @ $TorqueScriptFileExtension );
// Make sure we get editor profiles before any GUI's
// BUG: these dialogs are needed earlier in the init sequence, and should be moved to
// common, along with the guiProfiles they depend on.
exec( "./gui/guiDialogs.ed.tscript" );
exec( "./gui/guiDialogs.ed." @ $TorqueScriptFileExtension );
//%toggle = $Scripts::ignoreDSOs;
//$Scripts::ignoreDSOs = true;
@ -98,12 +98,12 @@ function onStart()
$editors[%i] = getWord( $Tools::loadFirst, %i );
}
%pattern = $Tools::resourcePath @ "/*/main.tscript";
%pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension;
%folder = findFirstFile( %pattern );
if ( %folder $= "")
{
// if we have absolutely no matches for main.tscript, we look for main.tscript.dso
%pattern = $Tools::resourcePath @ "/*/main.tscript.dso";
%pattern = $Tools::resourcePath @ "/*/main." @ $TorqueScriptFileExtension @ ".dso";
%folder = findFirstFile( %pattern );
}
while ( %folder !$= "" )
@ -130,7 +130,7 @@ function onStart()
%count = $editors[count];
for ( %i = 0; %i < %count; %i++ )
{
exec( "./" @ $editors[%i] @ "/main.tscript" );
exec( "./" @ $editors[%i] @ "/main." @ $TorqueScriptFileExtension );
%initializeFunction = "initialize" @ $editors[%i];
if( isFunction( %initializeFunction ) )
@ -355,7 +355,7 @@ function Tools::LoadResources( %path )
for( %i = 0; %i < %wordCount; %i++ )
{
%resource = GetField( %resourcesList, %i );
if( isFile( %resourcesPath @ %resource @ "/resourceDatabase.tscript") )
if( isFile( %resourcesPath @ %resource @ "/resourceDatabase." @ $TorqueScriptFileExtension) )
ResourceObject::load( %path, %resource );
}
}