From 04c9a0e9fdf4540a19c639f601a5327e7e3986c7 Mon Sep 17 00:00:00 2001 From: Deyan Dobromirov Date: Thu, 25 Jul 2024 16:42:15 +0300 Subject: [PATCH] Updated: Model validation control statements --- lua/autorun/trackassembly_init.lua | 2 +- lua/trackassembly/trackasmlib.lua | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lua/autorun/trackassembly_init.lua b/lua/autorun/trackassembly_init.lua index 401ceb3..c9bdeeb 100644 --- a/lua/autorun/trackassembly_init.lua +++ b/lua/autorun/trackassembly_init.lua @@ -86,7 +86,7 @@ local asmlib = trackasmlib; if(not asmlib) then -- Module present ------------ CONFIGURE ASMLIB ------------ asmlib.InitBase("track","assembly") -asmlib.SetOpVar("TOOL_VERSION","8.753") +asmlib.SetOpVar("TOOL_VERSION","8.754") ------------ CONFIGURE GLOBAL INIT OPVARS ------------ diff --git a/lua/trackassembly/trackasmlib.lua b/lua/trackassembly/trackasmlib.lua index a8d5e94..bdecd08 100644 --- a/lua/trackassembly/trackasmlib.lua +++ b/lua/trackassembly/trackasmlib.lua @@ -310,21 +310,21 @@ function IsModel(sModel, bDeep) local vFile = libModel.File[sModel] -- File current status if(IsHere(vFile)) then -- File validation status is present if(not vFile) then -- File is validated as invalid path - LogInstance("Invalid file "..GetReport(sModel)); return false end - else -- File validation status update - if(IsUselessModel(sModel)) then libModel.File[sModel] = false - LogInstance("File useless "..GetReport(sModel)); return false end - if(not fileExists(sModel, "GAME")) then libModel.File[sModel] = false - LogInstance("File missing "..GetReport(sModel)); return false end + LogInstance("Invalid file "..GetReport(sModel)); return vFile end + else -- File validation status update. Status is missing. Calculate. + vFile = false; libModel.File[sModel] = vFile -- Assume being invalid + if(IsUselessModel(sModel)) then --Check model being Aqua from Konosuba + LogInstance("File useless "..GetReport(sModel)); return vFile end + if(not fileExists(sModel, "GAME")) then -- Check model being a unicorn + LogInstance("File missing "..GetReport(sModel)); return vFile end vFile = true; libModel.File[sModel] = vFile -- The file validated LogInstance("File >> "..GetReport(vDeep, vFile, sModel)) end -- At this point file path is valid. Have to validate model - if(CLIENT or not bDeep) then return vFile else -- File is validated - utilPrecacheModel(sModel); vDeep = utilIsValidModel(sModel) - libModel.Deep[sModel] = vDeep -- Store deep validation - LogInstance("Deep >> "..GetReport(vDeep, vFile, sModel)) - return vDeep -- Gonna spawn - end + if(CLIENT or not bDeep) then return vFile end -- File is validated + utilPrecacheModel(sModel); vDeep = utilIsValidModel(sModel) + libModel.Deep[sModel] = vDeep -- Store deep validation + LogInstance("Deep >> "..GetReport(vDeep, vFile, sModel)) + return vDeep -- Gonna spawn on the server. Must validate. end -- Strips a string from quotes