aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeija <norrepli@gmail.com>2013-02-11 09:58:58 +0100
committerkwolekr <kwolekr@minetest.net>2013-03-17 00:23:30 -0400
commitfc5d2074b99d22022d2bf8e693351274bc3f6d09 (patch)
tree6e2f989012bb793a821dc5b505ef98cab58b03fe
parent10c03e1a9d09ba0369ea3fbff1ec3a9436a3b706 (diff)
downloadminetest-fc5d2074b99d22022d2bf8e693351274bc3f6d09.tar.gz
minetest-fc5d2074b99d22022d2bf8e693351274bc3f6d09.tar.bz2
minetest-fc5d2074b99d22022d2bf8e693351274bc3f6d09.zip
Allow minetest.after to take a variable number of arguments
-rw-r--r--builtin/misc.lua6
-rw-r--r--doc/lua_api.txt4
2 files changed, 5 insertions, 5 deletions
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)
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 809d3d9d0..eb05d117e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -977,9 +977,9 @@ minetest.sound_play(spec, parameters) -> handle
minetest.sound_stop(handle)
Timing:
-minetest.after(time, func, param)
+minetest.after(time, func, ...)
^ Call function after time seconds
-^ param is optional; to pass multiple parameters, pass a table.
+^ Optional: Variable number of arguments that are passed to func
Server:
minetest.request_shutdown() -> request for server shutdown