minetest-mods
/
mesecons
mirror of https://github.com/minetest-mods/mesecons.git
1
0
Fork 2
Code Issues Releases Wiki Activity

Rename merge_replace to merge_tables

This commit is contained in:
numzero 2020-09-21 23:47:20 +03:00
parent 26274edc1d
commit 8d11530ed9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesecons/util.lua
View File

@ -204,7 +204,7 @@ function mesecon.cmpAny(t1, t2)
return true return true
end end
-- Deprecated. Use `merge_replace` or `merge_rule_sets` as appropriate. -- Deprecated. Use `merge_tables` or `merge_rule_sets` as appropriate.
function mesecon.mergetable(source, dest) function mesecon.mergetable(source, dest)
minetest.log("warning", debug.traceback("Deprecated call to mesecon.mergetable")) minetest.log("warning", debug.traceback("Deprecated call to mesecon.mergetable"))
local rval = mesecon.tablecopy(dest) local rval = mesecon.tablecopy(dest)
@ -233,9 +233,9 @@ end
-- Merges two tables, with entries from `replacements` taking precedence over -- Merges two tables, with entries from `replacements` taking precedence over
-- those from `base`. Returns the new table. -- those from `base`. Returns the new table.
-- Values are deep-copied from either table, keys are referenced.
-- Numerical indices aren’t handled specially. -- Numerical indices aren’t handled specially.
-- Values are copied, keys are referenced. function mesecon.merge_tables(base, replacements)
function mesecon.merge_replace(base, replacements)
local ret = mesecon.tablecopy(replacements) -- these are never overriden so have to be copied in any case local ret = mesecon.tablecopy(replacements) -- these are never overriden so have to be copied in any case
for k, v in pairs(base) do for k, v in pairs(base) do
if ret[k] == nil then -- it could be `false` if ret[k] == nil then -- it could be `false`
@ -252,8 +252,8 @@ function mesecon.register_node(name, spec_common, spec_off, spec_on)
spec_on.__mesecon_state = "on" spec_on.__mesecon_state = "on"
spec_off.__mesecon_state = "off" spec_off.__mesecon_state = "off"
spec_on = mesecon.merge_replace(spec_common, spec_on); spec_on = mesecon.merge_tables(spec_common, spec_on);
spec_off = mesecon.merge_replace(spec_common, spec_off); spec_off = mesecon.merge_tables(spec_common, spec_off);
minetest.register_node(name .. "_on", spec_on) minetest.register_node(name .. "_on", spec_on)
minetest.register_node(name .. "_off", spec_off) minetest.register_node(name .. "_off", spec_off)

2
mesecons_extrawires/mesewire.lua
View File

@ -18,7 +18,7 @@ minetest.override_item("default:mese", {
-- Copy node definition of powered mese from normal mese -- Copy node definition of powered mese from normal mese
-- and brighten texture tiles to indicate mese is powered -- and brighten texture tiles to indicate mese is powered
local powered_def = mesecon.merge_replace(minetest.registered_nodes["default:mese"], { local powered_def = mesecon.merge_tables(minetest.registered_nodes["default:mese"], {
drop = "default:mese", drop = "default:mese",
light_source = 5, light_source = 5,
mesecons = {conductor = { mesecons = {conductor = {