summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeija <norrepli@gmail.com>2014-12-20 10:11:12 +0100
committerJeija <norrepli@gmail.com>2014-12-20 10:11:12 +0100
commit011543a782152f384a921f7264d87197a12a8497 (patch)
tree21e9d83067ca6cbdec9f14bfafcc7a063a97aeba
parentb3aa8f5d1394ea1b1eec0d445b14638de235052d (diff)
downloadmesecons-011543a782152f384a921f7264d87197a12a8497.tar
mesecons-011543a782152f384a921f7264d87197a12a8497.tar.gz
mesecons-011543a782152f384a921f7264d87197a12a8497.tar.bz2
mesecons-011543a782152f384a921f7264d87197a12a8497.tar.xz
mesecons-011543a782152f384a921f7264d87197a12a8497.zip
Fix #196, removes soft-depend on commonlib
-rw-r--r--mesecons/util.lua39
-rw-r--r--mesecons_luacontroller/init.lua3
2 files changed, 10 insertions, 32 deletions
diff --git a/mesecons/util.lua b/mesecons/util.lua
index a64e00c..4429a5a 100644
--- a/mesecons/util.lua
+++ b/mesecons/util.lua
@@ -6,18 +6,6 @@ function mesecon.move_node(pos, newpos)
minetest.get_meta(pos):from_table(meta)
end
---[[ new functions:
-mesecon.flattenrules(allrules)
-mesecon.rule2bit(findrule, allrules)
-mesecon.rule2meta(findrule, allrules)
-dec2bin(n)
-mesecon.getstate(nodename, states)
-mesecon.getbinstate(nodename, states)
-mesecon.get_bit(binary, bit)
-mesecon.set_bit(binary, bit, value)
-mesecon.invertRule(r)
---]]
-
function mesecon.flattenrules(allrules)
--[[
{
@@ -101,21 +89,12 @@ function mesecon.rule2meta(findrule, allrules)
return allrules[index]
end
-if convert_base then
- print(
- "base2dec is tonumber(num,base1)\n"..
- "commonlib needs dec2base(num,base2)\n"..
- "and it needs base2base(num,base1,base2),\n"..
- "which is dec2base(tonumber(num,base1),base2)"
- )
-else
- function dec2bin(n)
- local x, y = math.floor(n / 2), n % 2
- if (n > 1) then
- return dec2bin(x)..y
- else
- return ""..y
- end
+function mesecon.dec2bin(n)
+ local x, y = math.floor(n / 2), n % 2
+ if (n > 1) then
+ return mesecon.dec2bin(x)..y
+ else
+ return ""..y
end
end
@@ -129,7 +108,7 @@ function mesecon.getstate(nodename, states)
end
function mesecon.getbinstate(nodename, states)
- return dec2bin(mesecon.getstate(nodename, states)-1)
+ return mesecon.dec2bin(mesecon.getstate(nodename, states)-1)
end
function mesecon.get_bit(binary,bit)
@@ -141,11 +120,11 @@ end
function mesecon.set_bit(binary,bit,value)
if value == "1" then
if not mesecon.get_bit(binary,bit) then
- return dec2bin(tonumber(binary,2)+math.pow(2,bit-1))
+ return mesecon.dec2bin(tonumber(binary,2)+math.pow(2,bit-1))
end
elseif value == "0" then
if mesecon.get_bit(binary,bit) then
- return dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
+ return mesecon.dec2bin(tonumber(binary,2)-math.pow(2,bit-1))
end
end
return binary
diff --git a/mesecons_luacontroller/init.lua b/mesecons_luacontroller/init.lua
index 4af91e7..df681d9 100644
--- a/mesecons_luacontroller/init.lua
+++ b/mesecons_luacontroller/init.lua
@@ -559,7 +559,6 @@ for d = 0, 1 do
node_box = node_box,
on_construct = reset_meta,
on_receive_fields = on_receive_fields,
- on_timer = handle_timer,
sounds = default.node_sound_stone_defaults(),
mesecons = mesecons,
digiline = digiline,
@@ -600,7 +599,7 @@ minetest.register_node(BASENAME .. "_burnt", {
groups = {dig_immediate=2, not_in_creative_inventory=1},
drop = BASENAME.."0000",
sunlight_propagates = true,
- selection_box = selectionbox,
+ selection_box = selection_box,
node_box = node_box,
on_construct = reset_meta,
on_receive_fields = on_receive_fields,