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

registerDatablock update in-place.

Browse source 
Maintains load order for datablock files that are overridden by registerDatablock.
This commit is contained in:
OTHGMars 2020-08-07 05:27:36 -04:00
parent 840ad6d385
commit 6534957496
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Templates/BaseGame/game/core/utility/scripts/module.cs
View file

@ -124,14 +124,16 @@ function SimSet::registerDatablock(%scopeSet, %datablockFilePath, %isExclusive)
if ((!%locked && !%isExclusive)&&($reportModuleFileConflicts))
error("found" SPC %datablockFilePath SPC "duplicate file!");
if (!%locked || (%locked && %isExclusive))
{
DatablockFilesList.erase(%i);
{ // Replacing an existing entry, update in-place
DatablockFilesList.setKey(%fullPath, %i);
DatablockFilesList.setValue(%isExclusive, %i);
%locked = true; //Done, but don't return and bypass trace logging below
}
break;
}
}
//if we're not locked, or we are exclusive, go ahead and add it to the pile
//(ensures exclusives get re-added after that erasure)
if (!%locked || %isExclusive)
//if we're not locked, go ahead and add it to the pile
if (!%locked)
DatablockFilesList.add(%fullPath,%isExclusive);
if ($traceModuleCalls)
DatablockFilesList.echo();