X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=builtin%2Fgame%2Fmisc.lua;h=39ef9b461ce08b3654d5c4595230e8844a940675;hb=912ba1e47f61be18fa01cc91936929168c883f7b;hp=d7164812aaa4c5046bcb1c0fa6f23b8e2171aab0;hpb=0b0075e6ad0b3110cabdfc92cedb0a24d2b5ec42;p=minetest.git

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index d7164812a..39ef9b461 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -4,50 +4,6 @@
 -- 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(name, ...)
 	local arg_type = type(name)
 	if (arg_type == "userdata" or arg_type == "table") and
@@ -56,11 +12,11 @@ function core.check_player_privs(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
@@ -76,30 +32,40 @@ function core.check_player_privs(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)
 	local player_name = player:get_player_name()
 	player_list[player_name] = player
-	core.chat_send_all("*** " .. player_name .. " joined the game.")
+	core.send_join_message(player_name)
 end)
 
 core.register_on_leaveplayer(function(player, timed_out)
 	local player_name = player:get_player_name()
 	player_list[player_name] = nil
-	local announcement = "*** " ..  player_name .. " left the game."
-	if timed_out then
-		announcement = announcement .. " (timed out)"
-	end
-	core.chat_send_all(announcement)
+	core.send_leave_message(player_name, timed_out)
 end)
 
 function core.get_connected_players()
@@ -112,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)
@@ -159,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
@@ -208,34 +178,11 @@ function core.http_add_fetch(httpenv)
 	return httpenv
 end
 
-if minetest.setting_getbool("disable_escape_sequences") then
-
-	function core.get_color_escape_sequence(color)
-		return ""
-	end
-
-	function core.get_background_escape_sequence(color)
-		return ""
-	end
-
-	function core.colorize(color, message)
-		return message
-	end
-
-else
-
-	local ESCAPE_CHAR = string.char(0x1b)
-	function core.get_color_escape_sequence(color)
-		return ESCAPE_CHAR .. "(c@" .. color .. ")"
-	end
-
-	function core.get_background_escape_sequence(color)
-		return ESCAPE_CHAR .. "(b@" .. color .. ")"
-	end
-
-	function core.colorize(color, message)
-		return core.get_color_escape_sequence(color) .. message .. core.get_color_escape_sequence("#ffffff")
-	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