dvdvideo1234/TrackAssemblyTool
1
0
Fork 0
mirror of https://github.com/dvdvideo1234/TrackAssemblyTool.git synced 2025-03-04 03:13:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Timer handling

Browse Source 
Renamed: TABLEDEF_ key
This commit is contained in:
dvdvideo1234 2015-09-29 11:02:04 +03:00
parent 5a28af1d93
commit aacd171bbe
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/autorun/trackassembly_init.lua
View File

@ -12,7 +12,7 @@ asmlib.SetIndexes("V",1,2,3)
asmlib.SetIndexes("A",1,2,3)
asmlib.SetIndexes("S",4,5,6,7)
asmlib.InitAssembly("track")
asmlib.SetOpVar("TOOL_VERSION",12)
asmlib.SetOpVar("TOOL_VERSION",13)
asmlib.SetOpVar("DIRPATH_BAS",asmlib.GetOpVar("TOOLNAME_NL").."/")
asmlib.SetOpVar("DIRPATH_EXP","export/")
asmlib.SetOpVar("DIRPATH_DSV","dsvbase/")

4
lua/entities/gmod_wire_expression2/core/custom/trackasmlib_wire.lua
View File

@ -182,7 +182,7 @@ e2function array trackasmlibGetAdditionsLine(string sModel, number nLine)
local stRecord = asmlib.CacheQueryAdditions(sModel)
if(not (stRecord and stRecord[nLine])) then return nil else stRecord = stRecord[nLine] end
local arAddtitionsLine = {}
local defTable = asmlib.GetOpVar("TABLEDEF_ADDITIONS")
local defTable = asmlib.GetOpVar("DEFTABLE_ADDITIONS")
local cntField = 2
while(defTable[cntField]) do
arAddtitionsLine[cntField] = stRecord[defTable[cntField][1]]
@ -199,7 +199,7 @@ e2function array entity:trackasmlibGetAdditionsLine(number nLine)
local stRecord = asmlib.CacheQueryAdditions(string.lower(this:GetModel()))
if(not (stRecord and stRecord[nLine])) then return nil else stRecord = stRecord[nLine] end
local arAddtitionsLine = {}
local defTable = asmlib.GetOpVar("TABLEDEF_ADDITIONS")
local defTable = asmlib.GetOpVar("DEFTABLE_ADDITIONS")
local cntField = 2
while(defTable[cntField]) do
arAddtitionsLine[cntField] = stRecord[defTable[cntField][1]]

24
lua/trackassembly/trackasmlib.lua
View File

@ -755,7 +755,7 @@ function GetFrequentModels(snCount)
local Cnt = tonumber(snCount) or 0
if(Cnt < 1) then return nil end
local FreqUse = GetOpVar("TABLE_FREQUENT_MODELS")
local defTable = GetOpVar("TABLEDEF_PIECES")
local defTable = GetOpVar("DEFTABLE_PIECES")
local namTable = defTable.Name
local Cache = LibCache[namTable]
local TimerID = ""
@ -2028,10 +2028,10 @@ function CreateTable(sTable,defTable,bDelete,bReload)
if(not (type(defTable) == "table")) then return StatusLog(false,"CreateTable(): Table definition missing for "..sTable) end
defTable.Size = ArrayCount(defTable)
if(defTable.Size <= 0) then return StatusLog(false,"CreateTable(): Record definition empty for "..sTable) end
local sModeDB = tostring(GetOpVar("MODE_DATABASE"))
local sModeDB = tostring(GetOpVar("MODE_DATABASE"))
local sTable = string.upper(sTable)
defTable.Name = GetOpVar("TOOLNAME_PU")..sTable
SetOpVar("TABLEDEF_"..sTable,defTable)
SetOpVar("DEFTABLE_"..sTable,defTable)
local sDisable = GetOpVar("OPSYM_DISABLE")
local namTable = defTable.Name
local Cnt, defField = 1, nil
@ -2113,7 +2113,7 @@ function InsertRecord(sTable,tData)
if(not IsString(sTable)) then
return StatusLog(false,"InsertRecord(): Missing: Table definition name "..tostring(sTable).." ("..type(sTable)..")")
end
local defTable = GetOpVar("TABLEDEF_"..sTable)
local defTable = GetOpVar("DEFTABLE_"..sTable)
if(not defTable) then
return StatusLog(false,"InsertRecord(): Missing: Table definition for "..sTable)
end
@ -2262,7 +2262,6 @@ local function AttachKillTimer(oLocation,tKeys,defTable,anyMessage)
if(not defTable) then return false end
if(not defTable.Timer) then return false end
local Life = defTable.Timer.Life or 0
local Kill = defTable.Timer.Kill and true or false
if(Life <= 0) then return false end
local Place, Key = NavigateTable(oLocation,tKeys)
if(not (IsExistent(Place) and IsExistent(Key))) then
@ -2273,6 +2272,7 @@ local function AttachKillTimer(oLocation,tKeys,defTable,anyMessage)
LogInstance("AttachKillTimer(): TimID: <"..TimerID..">")
if(not IsExistent(Place[Key])) then return StatusLog(false,"AttachKillTimer(): Place not found") end
if(timer.Exists(TimerID)) then return StatusLog(false,"AttachKillTimer(): Timer exists") end
local Kill = defTable.Timer.Kill and true or false
timer.Create(TimerID, Life 1, function()
LogInstance("AttachKillTimer["..TimerID.."]("..Life.."): "
..tostring(anyMessage).." > Dead")
@ -2300,7 +2300,7 @@ function CacheQueryPiece(sModel)
if(not IsString(sModel)) then return nil end
if(sModel == "") then return nil end
if(not util.IsValidModel(sModel)) then return nil end
local defTable = GetOpVar("TABLEDEF_PIECES")
local defTable = GetOpVar("DEFTABLE_PIECES")
if(not defTable) then return StatusLog(nil,"CacheQueryPiece(): Missing: Table definition") end
local namTable = defTable.Name
local Cache = LibCache[namTable]
@ -2366,7 +2366,7 @@ function CacheQueryAdditions(sModel)
if(sModel == "") then return nil end
if(not util.IsValidModel(sModel)) then return nil end
LogInstance("CacheQueryAdditions: "..sModel)
local defTable = GetOpVar("TABLEDEF_ADDITIONS")
local defTable = GetOpVar("DEFTABLE_ADDITIONS")
if(not defTable) then return StatusLog(nil,"CacheQueryAdditions(): Missing: Table definition") end
local namTable = defTable.Name
local Cache = LibCache[namTable]
@ -2415,7 +2415,7 @@ end
--- Used to Populate the CPanel Tree
function CacheQueryPanel()
local defTable = GetOpVar("TABLEDEF_PIECES")
local defTable = GetOpVar("DEFTABLE_PIECES")
if(not defTable) then
return StatusLog(false,"CacheQueryPanel: Missing(): Table definition")
end
@ -2467,7 +2467,7 @@ end
--- Used to Populate the CPanel Phys Materials
function CacheQueryProperty(sType)
local defTable = GetOpVar("TABLEDEF_PHYSPROPERTIES")
local defTable = GetOpVar("DEFTABLE_PHYSPROPERTIES")
if(not defTable) then
return StatusLog(nil,"CacheQueryProperty(): Table definition missing")
end
@ -2589,7 +2589,7 @@ function ImportFromDSV(sTable,sDelim,bCommit,sPrefix)
if(not IsString(sTable)) then
return StatusLog(false,"ImportFromDSV(): Table name should be string but "..type(sTable))
end
local defTable = GetOpVar("TABLEDEF_"..sTable)
local defTable = GetOpVar("DEFTABLE_"..sTable)
if(not defTable) then
return StatusLog(false,"ImportFromDSV(): Missing: Table definition for "..sTable)
end
@ -2642,7 +2642,7 @@ function ExportIntoFile(sTable,sDelim,sMethod,sPrefix)
if(not IsString(sMethod)) then
return StatusLog(false,"ExportIntoFile(): Export mode should be string but "..type(sTable))
end
local defTable = GetOpVar("TABLEDEF_"..sTable)
local defTable = GetOpVar("DEFTABLE_"..sTable)
if(not defTable) then
return StatusLog(false,"ExportIntoFile(): Missing: Table definition for "..sTable)
end
@ -3014,7 +3014,7 @@ function AttachAdditions(ePiece)
if(qData) then
local Record, Addition
local Cnt = 1
local defTable = GetOpVar("TABLEDEF_ADDITIONS")
local defTable = GetOpVar("DEFTABLE_ADDITIONS")
while(qData[Cnt]) do
LogInstance("\n\nEnt [ "..Cnt.." ] INFO : ")
Record = qData[Cnt]

4
lua/weapons/gmod_tool/stools/trackassembly.lua
View File

@ -815,7 +815,7 @@ function TOOL.BuildCPanel(CPanel)
Combo["CVars"][23] = gsToolPrefL.."physmater"
CPanel:AddControl("ComboBox",Combo)
CurY = CurY + 25
local defTable = asmlib.GetOpVar("TABLEDEF_PIECES")
local defTable = asmlib.GetOpVar("DEFTABLE_PIECES")
local Panel = asmlib.CacheQueryPanel()
if(not Panel) then
return asmlib.StatusPrint(nil,"TOOL:BuildCPanel(cPanel): Panel population empty")
@ -884,7 +884,7 @@ function TOOL.BuildCPanel(CPanel)
pComboPhysName:SetValue(asmlib.StringDefault(
asmlib.GetCvar("physmater","STR"),"<Select Surface Material NAME>"))
CurY = CurY + pComboPhysName:GetTall() + 2
local defTable = asmlib.GetOpVar("TABLEDEF_PHYSPROPERTIES")
local defTable = asmlib.GetOpVar("DEFTABLE_PHYSPROPERTIES")
local Property = asmlib.CacheQueryProperty()
if(not Property) then
return asmlib.StatusPrint(nil,"TOOL:BuildCPanel(cPanel): Property population empty")