diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /builtin/misc.lua | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'builtin/misc.lua')
| -rw-r--r-- | builtin/misc.lua | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/builtin/misc.lua b/builtin/misc.lua index e018aff85..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(timer.param) + timer.func(unpack(timer.args or {})) 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={...}}) end function minetest.check_player_privs(name, privs) @@ -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 + |