Move on join and on leave messages to lua (#4460)

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

diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 8d5c80216ce173975b6c87c525b515d4ee1abc14..d7164812aaa4c5046bcb1c0fa6f23b8e2171aab0 100644 (file)
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -48,11 +48,13 @@ function core.after(after, func, ...)
        }
 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 = {...}
@@ -85,11 +87,19 @@ end
 local player_list = {}
 
 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.chat_send_all("*** " .. player_name .. " joined the game.")
 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
+       local announcement = "*** " ..  player_name .. " left the game."
+       if timed_out then
+               announcement = announcement .. " (timed out)"
+       end
+       core.chat_send_all(announcement)
 end)
 
 function core.get_connected_players()
@@ -198,19 +208,34 @@ function core.http_add_fetch(httpenv)
        return httpenv
 end
 
-function core.get_color_escape_sequence(color)
-       --if string.len(color) == 3 then
-       --      local r = string.sub(color, 1, 1)
-       --      local g = string.sub(color, 2, 2)
-       --      local b = string.sub(color, 3, 3)
-       --      color = r ..  r .. g .. g .. b .. b
-       --end
-
-       --assert(#color == 6, "Color must be six characters in length.")
-       --return "\v" .. color
-       return "\v(color;" .. color .. ")"
-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.colorize(color, message)
-       return core.get_color_escape_sequence(color) .. message .. core.get_color_escape_sequence("ffffff")
 end
+