From ba78194636a9a498f6979cc21cd39399f23d658a Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 24 Feb 2013 16:00:35 -0500 Subject: Allow any character in formspec strings with escape char --- builtin/misc.lua | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'builtin/misc.lua') diff --git a/builtin/misc.lua b/builtin/misc.lua index e018aff85..496435b33 100644 --- a/builtin/misc.lua +++ b/builtin/misc.lua @@ -99,3 +99,10 @@ function minetest.setting_get_pos(name) return minetest.string_to_pos(value) end +function minetest.formspec_escape(str) + str = string.gsub(str, "\\", "\\\\") + str = string.gsub(str, "%[", "\\[") + str = string.gsub(str, "%]", "\\]") + return str +end + -- cgit v1.2.3 From fc5d2074b99d22022d2bf8e693351274bc3f6d09 Mon Sep 17 00:00:00 2001 From: Jeija Date: Mon, 11 Feb 2013 09:58:58 +0100 Subject: Allow minetest.after to take a variable number of arguments --- builtin/misc.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'builtin/misc.lua') diff --git a/builtin/misc.lua b/builtin/misc.lua index 496435b33..2cc76e8ec 100644 --- a/builtin/misc.lua +++ b/builtin/misc.lua @@ -14,14 +14,14 @@ minetest.register_globalstep(function(dtime) for index, timer in ipairs(minetest.timers) do timer.time = timer.time - dtime if timer.time <= 0 then - timer.func(timer.param) + timer.func(unpack(timer.args)) table.remove(minetest.timers,index) end end end) -function minetest.after(time, func, param) - table.insert(minetest.timers_to_add, {time=time, func=func, param=param}) +function minetest.after(time, func, ...) + table.insert(minetest.timers_to_add, {time=time, func=func, args=arg}) end function minetest.check_player_privs(name, privs) -- cgit v1.2.3 From d6026a5fee11722798ddcb1e4d0b5638f16ba9ce Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 19 Mar 2013 00:13:00 +0100 Subject: Prevent passing nil to unpack() in minetest.after --- builtin/misc.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'builtin/misc.lua') diff --git a/builtin/misc.lua b/builtin/misc.lua index 2cc76e8ec..8308b3d6b 100644 --- a/builtin/misc.lua +++ b/builtin/misc.lua @@ -14,14 +14,14 @@ minetest.register_globalstep(function(dtime) for index, timer in ipairs(minetest.timers) do timer.time = timer.time - dtime if timer.time <= 0 then - timer.func(unpack(timer.args)) + timer.func(unpack(timer.args or {})) table.remove(minetest.timers,index) end end end) function minetest.after(time, func, ...) - table.insert(minetest.timers_to_add, {time=time, func=func, args=arg}) + table.insert(minetest.timers_to_add, {time=time, func=func, args={...}}) end function minetest.check_player_privs(name, privs) -- cgit v1.2.3