summaryrefslogtreecommitdiff
path: root/mesecons
diff options
context:
space:
mode:
authorJeija <norrepli@gmail.com>2013-01-19 22:18:28 +0100
committerJeija <norrepli@gmail.com>2013-01-19 23:37:03 +0100
commitef087f2bb63125e041e9ca24d77eb1b987a1b5cc (patch)
treef1dc25966bc5f1edbeb6c308538f3e31893aa9d9 /mesecons
parent62ddebaecbe0ad42488b66d0aee95a834c43af65 (diff)
downloadmesecons-ef087f2bb63125e041e9ca24d77eb1b987a1b5cc.tar
mesecons-ef087f2bb63125e041e9ca24d77eb1b987a1b5cc.tar.gz
mesecons-ef087f2bb63125e041e9ca24d77eb1b987a1b5cc.tar.bz2
mesecons-ef087f2bb63125e041e9ca24d77eb1b987a1b5cc.tar.xz
mesecons-ef087f2bb63125e041e9ca24d77eb1b987a1b5cc.zip
Fix Bug: Wrong usage of action_on/action_off instead of action_change
Diffstat (limited to 'mesecons')
-rw-r--r--mesecons/init.lua2
-rw-r--r--mesecons/internal.lua10
2 files changed, 6 insertions, 6 deletions
diff --git a/mesecons/init.lua b/mesecons/init.lua
index 50ed4ca..7f6fe5d 100644
--- a/mesecons/init.lua
+++ b/mesecons/init.lua
@@ -98,7 +98,7 @@ function mesecon:receptor_off(pos, rules)
if not mesecon:connected_to_receptor(np) then
mesecon:turnoff(np, rulename)
else
- mesecon:changesignal(np, minetest.env:get_node(np), rulename)
+ mesecon:changesignal(np, minetest.env:get_node(np), rulename, mesecon.state.off)
end
end
end
diff --git a/mesecons/internal.lua b/mesecons/internal.lua
index 2d84787..5e243cf 100644
--- a/mesecons/internal.lua
+++ b/mesecons/internal.lua
@@ -24,7 +24,7 @@
-- SIGNALS
-- mesecon:activate(pos, node) --> Activates the effector node at the specific pos (calls nodedef.mesecons.effector.action_on)
-- mesecon:deactivate(pos, node) --> Deactivates the effector node at the specific pos (calls nodedef.mesecons.effector.action_off)
--- mesecon:changesignal(pos, node) --> Changes the effector node at the specific pos (calls nodedef.mesecons.effector.action_change)
+-- mesecon:changesignal(pos, node, rulename, newstate) --> Changes the effector node at the specific pos (calls nodedef.mesecons.effector.action_change)
-- RULES
-- mesecon:add_rules(name, rules) | deprecated? --> Saves rules table by name
@@ -193,10 +193,10 @@ function mesecon:deactivate(pos, node, rulename)
end
end
-function mesecon:changesignal(pos, node, rulename)
+function mesecon:changesignal(pos, node, rulename, newstate)
local effector = mesecon:get_effector(node.name)
if effector and effector.action_change then
- effector.action_change (pos, node, rulename)
+ effector.action_change (pos, node, rulename, newstate)
end
end
@@ -299,7 +299,7 @@ function mesecon:turnon(pos, rulename)
end
end
elseif mesecon:is_effector(node.name) then
- mesecon:changesignal(pos, node, rulename)
+ mesecon:changesignal(pos, node, rulename, mesecon.state.on)
if mesecon:is_effector_off(node.name) then
mesecon:activate(pos, node, rulename)
end
@@ -322,7 +322,7 @@ function mesecon:turnoff(pos, rulename)
end
end
elseif mesecon:is_effector(node.name) then
- mesecon:changesignal(pos, node, rulename)
+ mesecon:changesignal(pos, node, rulename, mesecon.state.off)
if mesecon:is_effector_on(node.name)
and not mesecon:is_powered(pos) then
mesecon:deactivate(pos, node, rulename)