diff options
Diffstat (limited to 'builtin/common')
-rwxr-xr-x[-rw-r--r--] | builtin/common/information_formspecs.lua | 4 | ||||
-rw-r--r-- | builtin/common/misc_helpers.lua | 1 | ||||
-rw-r--r-- | builtin/common/vector.lua | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/builtin/common/information_formspecs.lua b/builtin/common/information_formspecs.lua index 1445a017c..d4426aff4 100644..100755 --- a/builtin/common/information_formspecs.lua +++ b/builtin/common/information_formspecs.lua @@ -57,11 +57,11 @@ local function build_chatcommands_formspec(name, sel, copy) .. "any entry in the list.").. "\n" .. S("Double-click to copy the entry to the chat history.") - local privs = core.get_player_privs(name) + local check_player_privs = core.check_player_privs for i, data in ipairs(mod_cmds) do rows[#rows + 1] = COLOR_BLUE .. ",0," .. F(data[1]) .. "," for j, cmds in ipairs(data[2]) do - local has_priv = privs[cmds[2].privs] + local has_priv = check_player_privs(name, cmds[2].privs) rows[#rows + 1] = ("%s,1,%s,%s"):format( has_priv and COLOR_GREEN or COLOR_GRAY, cmds[1], F(cmds[2].params)) diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua index 467f18804..a8ec5817a 100644 --- a/builtin/common/misc_helpers.lua +++ b/builtin/common/misc_helpers.lua @@ -5,6 +5,7 @@ local string_sub, string_find = string.sub, string.find -------------------------------------------------------------------------------- + local function basic_dump(o) local tp = type(o) if tp == "number" then diff --git a/builtin/common/vector.lua b/builtin/common/vector.lua index a08472e32..b662f73fc 100644 --- a/builtin/common/vector.lua +++ b/builtin/common/vector.lua @@ -125,6 +125,14 @@ function vector.distance(a, b) return math.sqrt(x * x + y * y + z * z) end +-- square roots are expensive +function vector.distance_sq(a, b) + local x = a.x - b.x + local y = a.y - b.y + local z = a.z - b.z + return x * x + y * y + z * z +end + function vector.direction(pos1, pos2) return vector.subtract(pos2, pos1):normalize() end |