From 03ffb6bc0a71a7c7057d835c730e9e4170b964bf Mon Sep 17 00:00:00 2001 From: Ryan Ward Date: Fri, 25 Feb 2022 14:36:21 -0500 Subject: [PATCH] Removed locking --- changes.md | 6 ------ multi/init.lua | 16 ---------------- 2 files changed, 22 deletions(-) diff --git a/changes.md b/changes.md index 09be44f..9a49b12 100644 --- a/changes.md +++ b/changes.md @@ -13,12 +13,6 @@ Full Update Showcase Added: --- -- `multi:lock()` - - Locks a multi object which prevents, Destroy(), Pause(), and Resume() being processed. - -- `multi:unlock()` - - Undoes the lock - - `multi:getProcessors()` - Returns a list of all processors diff --git a/multi/init.lua b/multi/init.lua index 60e026e..509e006 100644 --- a/multi/init.lua +++ b/multi/init.lua @@ -446,14 +446,6 @@ function multi:getType() return self.Type end -function multi:lock() - self.__locked = true -end - -function multi:unlock() - self.__locked = false -end - -- Advance Timer stuff function multi:SetTime(n) if not n then n=3 end @@ -486,7 +478,6 @@ end -- Timer stuff done multi.PausedObjects = {} function multi:Pause() - if self.__locked then multi.print("Cannot perform action on a locked object!") return end if self.Type=='rootprocess' then multi.print("You cannot pause the main process. Doing so will stop all methods and freeze your program! However if you still want to use multi:_Pause()") else @@ -504,7 +495,6 @@ function multi:Pause() end function multi:Resume() - if self.__locked then multi.print("Cannot perform action on a locked object!") return end if self.Type=='process' or self.Type=='rootprocess' then self.Active=true local c=self:getChildren() @@ -522,7 +512,6 @@ function multi:Resume() end function multi:Destroy() - if self.__locked then multi.print("Cannot perform action on a locked object!") return end if self.Type=='process' or self.Type=='rootprocess' then local c=self:getChildren() for i=1,#c do @@ -592,7 +581,6 @@ function multi:newBase(ins) c.Act=function() end c.Parent=self c.creationTime = os.clock() - c.__locked = false if ins then table.insert(self.Mainloop,ins,c) else @@ -707,7 +695,6 @@ function multi:newAlarm(set) end end function c:Resume() - if self.__locked then multi.print("Cannot perform action on a locked object!") return end self.Parent.Resume(self) t = count + t return self @@ -720,7 +707,6 @@ function multi:newAlarm(set) end c.OnRing = self:newConnection() function c:Pause() - if self.__locked then multi.print("Cannot perform action on a locked object!") return end count = clock() self.Parent.Pause(self) return self @@ -831,13 +817,11 @@ function multi:newTLoop(func,set) self.set = set end function c:Resume() - if self.__locked then multi.print("Cannot perform action on a locked object!") return end self.Parent.Resume(self) self.timer:Resume() return self end function c:Pause() - if self.__locked then multi.print("Cannot perform action on a locked object!") return end self.timer:Pause() self.Parent.Pause(self) return self