From: Jeija <norrepli@gmail.com>
Date: Mon, 11 Feb 2013 08:58:58 +0000 (+0100)
Subject: Allow minetest.after to take a variable number of arguments
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=fc5d2074b99d22022d2bf8e693351274bc3f6d09;p=zefram%2Fminetest%2Fminetest_engine.git

Allow minetest.after to take a variable number of arguments
---

diff --git a/builtin/misc.lua b/builtin/misc.lua
index 496435b3..2cc76e8e 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 809d3d9d..eb05d117 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