aboutsummaryrefslogtreecommitdiff
path: root/advtrains_luaautomation/interrupt.lua
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2021-02-17 19:45:52 +0100
committerorwell96 <orwell@bleipb.de>2021-02-17 19:45:52 +0100
commit04c78373f1db0b011557b92cd6fb58268cbeefe4 (patch)
tree8d79d0b946d2bd59d4e9bf891d120e18ae4630a8 /advtrains_luaautomation/interrupt.lua
parent1e4156d0a4e42b519ca2f64f4146c7a7faec49a3 (diff)
downloadadvtrains-04c78373f1db0b011557b92cd6fb58268cbeefe4.tar.gz
advtrains-04c78373f1db0b011557b92cd6fb58268cbeefe4.tar.bz2
advtrains-04c78373f1db0b011557b92cd6fb58268cbeefe4.zip
LuaATC: add interrupt_safe() and clear_interrupts(), fix queue mainloop
Diffstat (limited to 'advtrains_luaautomation/interrupt.lua')
-rw-r--r--advtrains_luaautomation/interrupt.lua35
1 files changed, 30 insertions, 5 deletions
diff --git a/advtrains_luaautomation/interrupt.lua b/advtrains_luaautomation/interrupt.lua
index 525c3b4..2e54ad8 100644
--- a/advtrains_luaautomation/interrupt.lua
+++ b/advtrains_luaautomation/interrupt.lua
@@ -16,6 +16,30 @@ function iq.save()
return {queue = queue, timer=timer}
end
+function iq.has_at_pos(pos)
+ for i=1,#queue do
+ local qe=queue[i]
+ if vector.equals(pos, qe.p) then
+ return true
+ end
+ end
+ return false
+end
+
+function iq.clear_ints_at_pos(pos)
+ local i=1
+ while i<=#queue do
+ local qe=queue[i]
+ if not qe then
+ table.remove(queue, i)
+ elseif vector.equals(pos, qe.p) and (qe.e.int or qe.e.ext_int) then
+ table.remove(queue, i)
+ else
+ i=i+1
+ end
+ end
+end
+
function iq.add(t, pos, evtdata)
queue[#queue+1]={t=t+timer, p=pos, e=evtdata}
run=true
@@ -23,13 +47,14 @@ end
function iq.mainloop(dtime)
timer=timer + math.min(dtime, 0.2)
- for i=1,#queue do
+ local i=1
+ while i<=#queue do
local qe=queue[i]
if not qe then
table.remove(queue, i)
- i=i-1
elseif timer>qe.t then
- local pos, evtdata=queue[i].p, queue[i].e
+ table.remove(queue, i)
+ local pos, evtdata=qe.p, qe.e
local node=advtrains.ndb.get_node(pos)
local ndef=minetest.registered_nodes[node.name]
if ndef and ndef.luaautomation and ndef.luaautomation.fire_event then
@@ -37,8 +62,8 @@ function iq.mainloop(dtime)
else
atwarn("[atlatc][interrupt] Couldn't run event",evtdata.type,"on",pos,", something wrong with the node",node)
end
- table.remove(queue, i)
- i=i-1
+ else
+ i=i+1
end
end
end