Fixed some bugs/consistency typos

some methods on actors were were not upper camel case
This commit is contained in:
Ryan 2017-06-14 17:41:07 -04:00
parent 62aa9120a8
commit ca5b1f3cd3

View File

@ -145,6 +145,7 @@ end
function multi:getParentProcess() function multi:getParentProcess()
return self.Mainloop[self.CID] return self.Mainloop[self.CID]
end end
multi.GetParentProcess=multi.getParentProcess
function multi:Stop() function multi:Stop()
self.Active=false self.Active=false
end end
@ -162,9 +163,11 @@ function multi:condition(cond)
self.Parent:Do_Order() self.Parent:Do_Order()
return true return true
end end
multi.Condition=multi.condition
function multi:isHeld() function multi:isHeld()
return self.held return self.held
end end
multi.IsHeld=multi.isHeld
function multi.executeFunction(name,...) function multi.executeFunction(name,...)
if type(_G[name])=='function' then if type(_G[name])=='function' then
_G[name](...) _G[name](...)
@ -180,6 +183,7 @@ function multi:waitFor(obj)
obj:connectFinal(self.__waiting) obj:connectFinal(self.__waiting)
self:hold(function() return value end) self:hold(function() return value end)
end end
multi.WaitFor=multi.waitFor
function multi:reboot(r) function multi:reboot(r)
local before=collectgarbage('count') local before=collectgarbage('count')
self.Mainloop={} self.Mainloop={}
@ -364,7 +368,7 @@ function multi.doFPS(s)
end end
end end
--Helpers --Helpers
function multi:isAnActor() function multi:IsAnActor()
return ({watcher=true,tstep=true,step=true,updater=true,loop=true,alarm=true,event=true})[self.Type] return ({watcher=true,tstep=true,step=true,updater=true,loop=true,alarm=true,event=true})[self.Type]
end end
function multi:OnMainConnect(func) function multi:OnMainConnect(func)
@ -407,6 +411,7 @@ function multi:reallocate(o,n)
table.insert(o.Mainloop,n,self) table.insert(o.Mainloop,n,self)
self.Active=true self.Active=true
end end
multi.Reallocate=multi.Reallocate
function multi:setJobSpeed(n) function multi:setJobSpeed(n)
self.jobUS=n self.jobUS=n
end end
@ -438,6 +443,7 @@ function multi:connectFinal(func)
self:OnBreak(func) self:OnBreak(func)
end end
end end
multi.ConnectFinal=multi.connectFinal
function multi:Break() function multi:Break()
self:Pause() self:Pause()
self.Active=nil self.Active=nil
@ -453,15 +459,19 @@ end
function multi:isPaused() function multi:isPaused()
return not(self.Active) return not(self.Active)
end end
multi.IsPaused=multi.isPaused
function multi:isActive() function multi:isActive()
return self.Active return self.Active
end end
multi.IsActive=multi.isActive
function multi:getType() function multi:getType()
return self.Type return self.Type
end end
multi.GetType=multi.getType
function multi:Sleep(n) function multi:Sleep(n)
self:hold(n) self:hold(n)
end end
multi.sleep=multi.Sleep
-- Advance Timer stuff -- Advance Timer stuff
function multi:SetTime(n) function multi:SetTime(n)
if not n then n=3 end if not n then n=3 end
@ -530,6 +540,7 @@ function multi:resurrect()
table.insert(self.Parent.Mainloop,self) table.insert(self.Parent.Mainloop,self)
self.Active=true self.Active=true
end end
multi.Resurrect=multi.resurrect
function multi:Destroy() function multi:Destroy()
if self.Type=='process' or self.Type=='mainprocess' then if self.Type=='process' or self.Type=='mainprocess' then
local c=self:getChildren() local c=self:getChildren()
@ -581,6 +592,7 @@ function multi:hold(task)
print('Error Data Type!!!') print('Error Data Type!!!')
end end
end end
multi.Hold=multi.hold
function multi:oneTime(func,...) function multi:oneTime(func,...)
if not(self.Type=='mainprocess' or self.Type=='process') then if not(self.Type=='mainprocess' or self.Type=='process') then
for _k=1,#self.Parent.Tasks2 do for _k=1,#self.Parent.Tasks2 do
@ -608,6 +620,7 @@ end
function multi:isDone() function multi:isDone()
return self.Active~=true return self.Active~=true
end end
multi.IsDone=multi.isDone
function multi:create(ref) function multi:create(ref)
multi.OnObjectCreated:Fire(ref) multi.OnObjectCreated:Fire(ref)
end end
@ -684,7 +697,7 @@ function multi:newProcess(file)
end end
if file then if file then
self.Cself=c self.Cself=c
loadstring('local interface=multi.Cself '..io.open(file,'rb'):read('*all'))() loadstring('local process=multi.Cself '..io.open(file,'rb'):read('*all'))()
end end
self:create(c) self:create(c)
return c return c
@ -908,11 +921,13 @@ function multi:newRange()
self:create(temp) self:create(temp)
return temp return temp
end end
multi.NewRange=multi.newRange
function multi:newCondition(func) function multi:newCondition(func)
local c={['condition']=func} local c={['condition']=func,Type="condition"}
self:create(c) self:create(c)
return c return c
end end
multi.NewCondition=multi.newCondition
function multi:mainloop() function multi:mainloop()
for i=1,#self.Tasks do for i=1,#self.Tasks do
self.Tasks[i](self) self.Tasks[i](self)