Removed: Rest of sub(1,1) checks

dvdvideo1234 · Jun 13, 2024 · 70039d5 · 70039d5
1 parent ec4a4ac
commit 70039d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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.770")
+asmlib.SetOpVar("TOOL_VERSION","8.771")
 
 ------------ CONFIGURE GLOBAL INIT OPVARS ------------
 
@@ -715,7 +715,6 @@ if(CLIENT) then
         asmlib.LogInstance("Sheet invalid",sLog); return nil end
       pnSheet:SetParent(pnFrame)
       pnSheet:Dock(FILL)
-      local sOff = asmlib.GetOpVar("OPSYM_DISABLE")
       local sMis = asmlib.GetOpVar("MISS_NOAV")
       local sLib = asmlib.GetOpVar("NAME_LIBRARY")
       local sBas = asmlib.GetOpVar("DIRPATH_BAS")
@@ -818,7 +817,7 @@ if(CLIENT) then
         while(not bEOF) do
           sLine, bEOF = asmlib.GetStringFile(oDSV)
           if(not asmlib.IsBlank(sLine)) then local sKey, sPrg
-            if(sLine:sub(1,1) ~= sOff) then bAct = true else
+            if(not asmlib.IsDisable(sLine)) then bAct = true else
               bAct, sLine = false, sLine:sub(2,-1):Trim() end
             local nS, nE = sLine:find("%s+")
             if(nS and nE) then
@@ -846,6 +845,7 @@ if(CLIENT) then
         if(not oDSV) then pnFrame:Close()
           asmlib.LogInstance("DSV list missing",sLog..".ListView"); return nil end
         local tLine = pnListView:GetLines()
+        local sOff  = asmlib.GetOpVar("OPSYM_DISABLE")
         for iK, pnCur in pairs(tLine) do
           local sAct = ((pnCur:GetColumnText(1) == "V") and "" or sOff)
           local sPrf = pnCur:GetColumnText(2)

diff --git a/lua/trackassembly/trackasmlib.lua b/lua/trackassembly/trackasmlib.lua
@@ -1888,7 +1888,7 @@ function SetButtonSlider(cPanel, sVar, nMin, nMax, nDec, tBtn)
     local sTip = tostring(vBtn.T or syDis):Trim()
     if(sTip:sub(1,1) == syRev) then
       sTip = languageGetPhrase(sBase.."_bas"..sTxt)
-    elseif(sTip:sub(1,1) == syDis) then
+    elseif(IsDisable(sTip)) then
       sTip = languageGetPhrase("tool."..sTool..".buttonas"..sTxt)
     end
     if(sTxt:sub(1,1) == syRev) then
@@ -2164,7 +2164,6 @@ function LocatePOA(oRec, ivPoID)
     LogInstance("Missing ID "..GetReport2(iPoID, oRec.Slot)); return nil end
   if(oRec.Tran) then oRec.Tran = nil -- Transforming has started
     local sE = GetOpVar("OPSYM_ENTPOSANG") -- Extract transform from model
-    local sD = GetOpVar("OPSYM_DISABLE") -- Use for searched hit point disabled
     for ID = 1, oRec.Size do local tPOA = tOffs[ID] -- Index current offset
       local sP, sO, sA = tPOA.P:Raw(), tPOA.O:Raw(), tPOA.A:Raw()
       -------------------- Origin --------------------