Clearobjects: Send progress messages to terminal using actionstream

[minetest.git] / builtin / game / misc.lua

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index de41cfc91161a44a10fdbbb69710db342a38bc79..39ef9b461ce08b3654d5c4595230e8844a940675 100644 (file)
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -4,61 +4,19 @@
 -- Misc. API functions
 --
 
-local jobs = {}
-local time = 0.0
-local last = core.get_us_time() / 1000000
-
-core.register_globalstep(function(dtime)
-       local new = core.get_us_time() / 1000000
-       if new > last then
-               time = time + (new - last)
-       else
-               -- Overflow, we may lose a little bit of time here but
-               -- only 1 tick max, potentially running timers slightly
-               -- too early.
-               time = time + new
-       end
-       last = new
-
-       if #jobs < 1 then
-               return
-       end
-
-       -- Iterate backwards so that we miss any new timers added by
-       -- a timer callback, and so that we don't skip the next timer
-       -- in the list if we remove one.
-       for i = #jobs, 1, -1 do
-               local job = jobs[i]
-               if time >= job.expire then
-                       core.set_last_run_mod(job.mod_origin)
-                       job.func(unpack(job.arg))
-                       table.remove(jobs, i)
-               end
-       end
-end)
-
-function core.after(after, func, ...)
-       assert(tonumber(time) and type(func) == "function",
-                       "Invalid core.after invocation")
-       jobs[#jobs + 1] = {
-               func = func,
-               expire = time + after,
-               arg = {...},
-               mod_origin = core.get_last_run_mod()
-       }
-end
-
-function core.check_player_privs(player_or_name, ...)
-       local name = player_or_name
-       -- Check if we have been provided with a Player object.
-       if type(name) ~= "string" then
+function core.check_player_privs(name, ...)
+       local arg_type = type(name)
+       if (arg_type == "userdata" or arg_type == "table") and
+                       name.get_player_name then -- If it quacks like a Player...
                name = name:get_player_name()
+       elseif arg_type ~= "string" then
+               error("Invalid core.check_player_privs argument type: " .. arg_type, 2)
        end
-       
+
        local requested_privs = {...}
        local player_privs = core.get_player_privs(name)
        local missing_privileges = {}
-       
+
        if type(requested_privs[1]) == "table" then
                -- We were provided with a table like { privA = true, privB = true }.
                for priv, value in pairs(requested_privs[1]) do
@@ -74,22 +32,40 @@ function core.check_player_privs(player_or_name, ...)
                        end
                end
        end
-       
+
        if #missing_privileges > 0 then
                return false, missing_privileges
        end
-       
+
        return true, ""
 end
 
 local player_list = {}
 
+function core.send_join_message(player_name)
+       if not minetest.is_singleplayer() then
+               core.chat_send_all("*** " .. player_name .. " joined the game.")
+       end
+end
+
+function core.send_leave_message(player_name, timed_out)
+       local announcement = "*** " ..  player_name .. " left the game."
+       if timed_out then
+               announcement = announcement .. " (timed out)"
+       end
+       core.chat_send_all(announcement)
+end
+
 core.register_on_joinplayer(function(player)
-       player_list[player:get_player_name()] = player
+       local player_name = player:get_player_name()
+       player_list[player_name] = player
+       core.send_join_message(player_name)
 end)
 
-core.register_on_leaveplayer(function(player)
-       player_list[player:get_player_name()] = nil
+core.register_on_leaveplayer(function(player, timed_out)
+       local player_name = player:get_player_name()
+       player_list[player_name] = nil
+       core.send_leave_message(player_name, timed_out)
 end)
 
 function core.get_connected_players()
@@ -102,6 +78,10 @@ function core.get_connected_players()
        return temp_table
 end
 
+function minetest.player_exists(name)
+       return minetest.get_auth_handler().get_auth(name) ~= nil
+end
+
 -- Returns two position vectors representing a box of `radius` in each
 -- direction centered around the player corresponding to `player_name`
 function core.get_player_radius_area(player_name, radius)
@@ -149,7 +129,7 @@ function core.get_node_group(name, group)
 end
 
 function core.setting_get_pos(name)
-       local value = core.setting_get(name)
+       local value = core.settings:get(name)
        if not value then
                return nil
        end
@@ -197,3 +177,12 @@ function core.http_add_fetch(httpenv)
 
        return httpenv
 end
+
+function core.close_formspec(player_name, formname)
+       return minetest.show_formspec(player_name, formname, "")
+end
+
+function core.cancel_shutdown_requests()
+       core.request_shutdown("", false, -1)
+end
+