Ponali
6f1508d1bf
TheWahlolly didn't know that arrays were stored in pointers when set into another variable, affecting the original array. I also made some changes into the code for ocelot logs so signals are much clearer to investigate (I hope).
32 lines
973 B
Lua
32 lines
973 B
Lua
local event = {}
|
|
|
|
local ocelot = component.proxy(component.list("ocelot")())
|
|
|
|
function event.pull(evtype, timeout)
|
|
checkArg(1, evtype, "string", "nil")
|
|
checkArg(2, timeout, "number", "nil")
|
|
local startTime = computer.uptime()
|
|
local args
|
|
repeat
|
|
for i = 1, #evmgr.eventQueue do
|
|
ocelot.log(tostring(evmgr.eventQueue[i][1]).." ("..type(evmgr.eventQueue[i][1]).."), "..tostring(evmgr.eventQueue[i][2]))
|
|
--ocelot.log(tostring(evmgr.eventQueue[i][3]))
|
|
--ocelot.log(tostring(evmgr.eventQueue[i][4]))
|
|
if evmgr.eventQueue[i][1] >= startTime and (evmgr.eventQueue[i][2] == evtype or not evtype) then
|
|
args = evmgr.eventQueue[i]
|
|
break
|
|
end
|
|
end
|
|
if not args then
|
|
coroutine.yield()
|
|
end
|
|
until args and not timeout or args and timeout and (args or computer.uptime() >= startTime + timeout)
|
|
if args then
|
|
--[[ table.remove(args, 1)
|
|
return table.unpack(args) ]]
|
|
return args[2]
|
|
end
|
|
end
|
|
|
|
return event
|