TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-28 11:03:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #457 from Azaezel/fix/db_file_suffix

Browse source 
augment datablock file handling to include references with no suffixes
This commit is contained in:
Brian Roberts 2021-01-24 02:55:32 -06:00 • committed by GitHub
commit 6226e9d575
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript
View file

@ -77,7 +77,7 @@ function loadDatablockFiles( %datablockFiles, %recurse )
for ( %i=0; %i < %count; %i++ )
{
%file = %datablockFiles.getKey( %i );
if ( !isFile(%file @ ".dso") && !isFile(%file) )
if (!isFile(%file) && !isFile(%file @ ".dso") && !isFile(%file @"."@ $TorqueScriptFileExtension @ ".dso") && !isFile(%file @"."@ $TorqueScriptFileExtension))
continue;
exec( %file );
@ -100,7 +100,7 @@ function recursiveLoadDatablockFiles( %datablockFiles, %previousErrors )
for ( %i=0; %i < %count; %i++ )
{
%file = %datablockFiles.getKey( %i );
if ( !isFile(%file @ ".dso") && !isFile(%file) )
if (!isFile(%file) && !isFile(%file @ ".dso") && !isFile(%file @"."@ $TorqueScriptFileExtension @ ".dso") && !isFile(%file @"."@ $TorqueScriptFileExtension))
continue;
// Start counting copy constructor creation errors.