Set acceleration only once in falling node

[minetest.git] / builtin / common / misc_helpers.lua

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index 1c9f2a48ff28ac0c30042a069336bea2241c694c..e4653d41dda1c53642f809a68594ffb0fde239f3 100644 (file)
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -2,7 +2,6 @@
 
 --------------------------------------------------------------------------------
 -- Localize functions to avoid table lookups (better performance).
-local table_insert = table.insert
 local string_sub, string_find = string.sub, string.find
 
 --------------------------------------------------------------------------------
@@ -94,13 +93,13 @@ function dump2(o, name, dumped)
                                -- the form _G["table: 0xFFFFFFF"]
                                keyStr = string.format("_G[%q]", tostring(k))
                                -- Dump key table
-                               table_insert(t, dump2(k, keyStr, dumped))
+                               t[#t + 1] = dump2(k, keyStr, dumped)
                        end
                else
                        keyStr = basic_dump(k)
                end
                local vname = string.format("%s[%s]", name, keyStr)
-               table_insert(t, dump2(v, vname, dumped))
+               t[#t + 1] = dump2(v, vname, dumped)
        end
        return string.format("%s = {}\n%s", name, table.concat(t))
 end
@@ -135,7 +134,7 @@ function dump(o, indent, nested, level)
        local t = {}
        local dumped_indexes = {}
        for i, v in ipairs(o) do
-               table_insert(t, dump(v, indent, nested, level + 1))
+               t[#t + 1] = dump(v, indent, nested, level + 1)
                dumped_indexes[i] = true
        end
        for k, v in pairs(o) do
@@ -144,7 +143,7 @@ function dump(o, indent, nested, level)
                                k = "["..dump(k, indent, nested, level + 1).."]"
                        end
                        v = dump(v, indent, nested, level + 1)
-                       table_insert(t, k.." = "..v)
+                       t[#t + 1] = k.." = "..v
                end
        end
        nested[o] = nil
@@ -159,6 +158,7 @@ function dump(o, indent, nested, level)
        return "{"..table.concat(t, ", ").."}"
 end
 
+--------------------------------------------------------------------------------
 function string.split(str, delim, include_empty, max_splits, sep_is_pattern)
        delim = delim or ","
        max_splits = max_splits or -1
@@ -176,17 +176,30 @@ function string.split(str, delim, include_empty, max_splits, sep_is_pattern)
                local s = string_sub(str, pos, np - 1)
                if include_empty or (s ~= "") then
                        max_splits = max_splits - 1
-                       table_insert(items, s)
+                       items[#items + 1] = s
                end
                pos = npe + 1
        until (max_splits == 0) or (pos > (len + 1))
        return items
 end
 
+--------------------------------------------------------------------------------
+function table.indexof(list, val)
+       for i, v in ipairs(list) do
+               if v == val then
+                       return i
+               end
+       end
+       return -1
+end
+
+assert(table.indexof({"foo", "bar"}, "foo") == 1)
+assert(table.indexof({"foo", "bar"}, "baz") == -1)
+
 --------------------------------------------------------------------------------
 function file_exists(filename)
        local f = io.open(filename, "r")
-       if f==nil then
+       if f == nil then
                return false
        else
                f:close()
@@ -310,7 +323,7 @@ function core.splittext(text,charlimit)
        local last_line = ""
        while start ~= nil do
                if string.len(last_line) + (stop-start) > charlimit then
-                       table_insert(retval, last_line)
+                       retval[#retval + 1] = last_line
                        last_line = ""
                end
 
@@ -321,7 +334,7 @@ function core.splittext(text,charlimit)
                last_line = last_line .. string_sub(text, current_idx, stop - 1)
 
                if gotnewline then
-                       table_insert(retval, last_line)
+                       retval[#retval + 1] = last_line
                        last_line = ""
                        gotnewline = false
                end
@@ -339,11 +352,11 @@ function core.splittext(text,charlimit)
 
        --add last part of text
        if string.len(last_line) + (string.len(text) - current_idx) > charlimit then
-                       table_insert(retval, last_line)
-                       table_insert(retval, string_sub(text, current_idx))
+                       retval[#retval + 1] = last_line
+                       retval[#retval + 1] = string_sub(text, current_idx)
        else
                last_line = last_line .. " " .. string_sub(text, current_idx)
-               table_insert(retval, last_line)
+               retval[#retval + 1] = last_line
        end
 
        return retval
@@ -416,14 +429,14 @@ if INIT == "game" then
 
                if iswall then
                        core.set_node(pos, {name = wield_name,
-                                       param2 = dirs1[fdir+1]})
+                                       param2 = dirs1[fdir + 1]})
                elseif isceiling then
                        if orient_flags.force_facedir then
                                core.set_node(pos, {name = wield_name,
                                                param2 = 20})
                        else
                                core.set_node(pos, {name = wield_name,
-                                               param2 = dirs2[fdir+1]})
+                                               param2 = dirs2[fdir + 1]})
                        end
                else -- place right side up
                        if orient_flags.force_facedir then
@@ -540,6 +553,36 @@ assert(core.string_to_pos("10.0, 5, -2").x == 10)
 assert(core.string_to_pos("( 10.0, 5, -2)").z == -2)
 assert(core.string_to_pos("asd, 5, -2)") == nil)
 
+--------------------------------------------------------------------------------
+function core.string_to_area(value)
+       local p1, p2 = unpack(value:split(") ("))
+       if p1 == nil or p2 == nil then
+               return nil
+       end
+
+       p1 = core.string_to_pos(p1 .. ")")
+       p2 = core.string_to_pos("(" .. p2)
+       if p1 == nil or p2 == nil then
+               return nil
+       end
+
+       return p1, p2
+end
+
+local function test_string_to_area()
+       local p1, p2 = core.string_to_area("(10.0, 5, -2) (  30.2,   4, -12.53)")
+       assert(p1.x == 10.0 and p1.y == 5 and p1.z == -2)
+       assert(p2.x == 30.2 and p2.y == 4 and p2.z == -12.53)
+
+       p1, p2 = core.string_to_area("(10.0, 5, -2  30.2,   4, -12.53")
+       assert(p1 == nil and p2 == nil)
+
+       p1, p2 = core.string_to_area("(10.0, 5,) -2  fgdf2,   4, -12.53")
+       assert(p1 == nil and p2 == nil)
+end
+
+test_string_to_area()
+
 --------------------------------------------------------------------------------
 function table.copy(t, seen)
        local n = {}