From 23e5e891ed0f4a57ae11e3c4e1ba90953ee4228c Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Fri, 8 Oct 2021 23:45:20 -0500 Subject: [PATCH] simplify callOnModules --- .../game/core/utility/scripts/module.tscript | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/Templates/BaseGame/game/core/utility/scripts/module.tscript b/Templates/BaseGame/game/core/utility/scripts/module.tscript index a895f99bf..1f6a755d1 100644 --- a/Templates/BaseGame/game/core/utility/scripts/module.tscript +++ b/Templates/BaseGame/game/core/utility/scripts/module.tscript @@ -4,8 +4,7 @@ if (!isObject(ExecFilesList)) new ArrayObject(ExecFilesList); function callOnModules(%functionName, %moduleGroup, %var0, %var1, %var2, %var3, %var4, %var5, %var6) -{ - %maxvars = 7; // match this to i/o signature +{ //clear per module group file execution chain ExecFilesList.empty(); //Get our modules so we can exec any specific client-side loading/handling @@ -19,22 +18,9 @@ function callOnModules(%functionName, %moduleGroup, %var0, %var1, %var2, %var3, if(%module.group !$= %moduleGroup) continue; } - + // match this to i/o signature if(isObject(%module.scopeSet) && %module.scopeSet.isMethod(%functionName)) - { - %stryng = %module.scopeSet @ "." @ %functionName @ "("; - for (%a=0;%a<%maxvars;%a++) - { - if (%var[%a] !$= "") - { - %stryng = %stryng @ %var[%a]; - if (%a<%maxvars-1 && %var[%a+1] !$= "") - %stryng = %stryng @ ","; - } - } - %stryng = %stryng @ ");"; - eval(%stryng); - } + %module.scopeSet.call(%functionName, %var0, %var1, %var2, %var3, %var4, %var5, %var6); } %execFilecount = ExecFilesList.count();