Builtin/../falling.lua: Code optimisation

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

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 0f10af8ee172414b13749700ed19a891d1c6403e..26ff8225c15715361399406778ffa79d6b2174a7 100644 (file)
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -27,19 +27,11 @@ function core.get_pointed_thing_position(pointed_thing, above)
                if above then
                        -- The position where a node would be placed
                        return pointed_thing.above
-               else
-                       -- The position where a node would be dug
-                       return pointed_thing.under
                end
+               -- The position where a node would be dug
+               return pointed_thing.under
        elseif pointed_thing.type == "object" then
-               obj = pointed_thing.ref
-               if obj ~= nil then
-                       return obj:getpos()
-               else
-                       return nil
-               end
-       else
-               return nil
+               return pointed_thing.ref and pointed_thing.ref:getpos()
        end
 end
 
@@ -96,25 +88,26 @@ function core.dir_to_facedir(dir, is6d)
        end
 end
 
+-- Table of possible dirs
+local facedir_to_dir = {
+       {x= 0, y=0,  z= 1},
+       {x= 1, y=0,  z= 0},
+       {x= 0, y=0,  z=-1},
+       {x=-1, y=0,  z= 0},
+       {x= 0, y=-1, z= 0},
+       {x= 0, y=1,  z= 0},
+}
+-- Mapping from facedir value to index in facedir_to_dir.
+local facedir_to_dir_map = {
+       [0]=1, 2, 3, 4,
+       5, 2, 6, 4,
+       6, 2, 5, 4,
+       1, 5, 3, 6,
+       1, 6, 3, 5,
+       1, 4, 3, 2,
+}
 function core.facedir_to_dir(facedir)
-       --a table of possible dirs
-       return ({{x=0, y=0, z=1},
-                                       {x=1, y=0, z=0},
-                                       {x=0, y=0, z=-1},
-                                       {x=-1, y=0, z=0},
-                                       {x=0, y=-1, z=0},
-                                       {x=0, y=1, z=0}})
-
-                                       --indexed into by a table of correlating facedirs
-                                       [({[0]=1, 2, 3, 4,
-                                               5, 2, 6, 4,
-                                               6, 2, 5, 4,
-                                               1, 5, 3, 6,
-                                               1, 6, 3, 5,
-                                               1, 4, 3, 2})
-
-                                               --indexed into by the facedir in question
-                                               [facedir]]
+       return facedir_to_dir[facedir_to_dir_map[facedir]]
 end
 
 function core.dir_to_wallmounted(dir)
@@ -139,6 +132,19 @@ function core.dir_to_wallmounted(dir)
        end
 end
 
+-- table of dirs in wallmounted order
+local wallmounted_to_dir = {
+       [0] = {x = 0, y = 1, z = 0},
+       {x =  0, y = -1, z =  0},
+       {x =  1, y =  0, z =  0},
+       {x = -1, y =  0, z =  0},
+       {x =  0, y =  0, z =  1},
+       {x =  0, y =  0, z = -1},
+}
+function core.wallmounted_to_dir(wallmounted)
+       return wallmounted_to_dir[wallmounted]
+end
+
 function core.get_node_drops(nodename, toolname)
        local drop = ItemStack({name=nodename}):get_definition().drop
        if drop == nil then
@@ -227,7 +233,8 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2)
                place_to = {x = under.x, y = under.y, z = under.z}
        end
 
-       if core.is_protected(place_to, placer:get_player_name()) then
+       if core.is_protected(place_to, placer:get_player_name()) and
+                       not minetest.check_player_privs(placer, "protection_bypass") then
                core.log("action", placer:get_player_name()
                                .. " tried to place " .. def.name
                                .. " at protected position "
@@ -243,7 +250,9 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2)
        local newnode = {name = def.name, param1 = 0, param2 = param2}
 
        -- Calculate direction for wall mounted stuff like torches and signs
-       if def.paramtype2 == 'wallmounted' and not param2 then
+       if def.place_param2 ~= nil then
+               newnode.param2 = def.place_param2
+       elseif def.paramtype2 == 'wallmounted' and not param2 then
                local dir = {
                        x = under.x - above.x,
                        y = under.y - above.y,
@@ -334,8 +343,12 @@ function core.item_place(itemstack, placer, pointed_thing, param2)
        return itemstack
 end
 
+function core.item_secondary_use(itemstack, placer)
+       return itemstack
+end
+
 function core.item_drop(itemstack, dropper, pos)
-       if dropper.is_player then
+       if dropper and dropper:is_player() then
                local v = dropper:get_look_dir()
                local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
                local cs = itemstack:get_count()
@@ -349,6 +362,7 @@ function core.item_drop(itemstack, dropper, pos)
                        v.y = v.y*2 + 2
                        v.z = v.z*2
                        obj:setvelocity(v)
+                       obj:get_luaentity().dropped_by = dropper:get_player_name()
                        return itemstack
                end
 
@@ -433,7 +447,8 @@ function core.node_dig(pos, node, digger)
                return
        end
 
-       if core.is_protected(pos, digger:get_player_name()) then
+       if core.is_protected(pos, digger:get_player_name()) and
+                       not minetest.check_player_privs(digger, "protection_bypass") then
                core.log("action", digger:get_player_name()
                                .. " tried to dig " .. node.name
                                .. " at protected position "
@@ -564,6 +579,7 @@ core.nodedef_default = {
        diggable = true,
        climbable = false,
        buildable_to = false,
+       floodable = false,
        liquidtype = "none",
        liquid_alternative_flowing = "",
        liquid_alternative_source = "",
@@ -591,6 +607,7 @@ core.craftitemdef_default = {
        -- Interaction callbacks
        on_place = redef_wrapper(core, 'item_place'), -- core.item_place
        on_drop = redef_wrapper(core, 'item_drop'), -- core.item_drop
+       on_secondary_use = redef_wrapper(core, 'item_secondary_use'),
        on_use = nil,
 }
 
@@ -608,6 +625,7 @@ core.tooldef_default = {
 
        -- Interaction callbacks
        on_place = redef_wrapper(core, 'item_place'), -- core.item_place
+       on_secondary_use = redef_wrapper(core, 'item_secondary_use'),
        on_drop = redef_wrapper(core, 'item_drop'), -- core.item_drop
        on_use = nil,
 }
@@ -626,6 +644,7 @@ core.noneitemdef_default = {  -- This is used for the hand and unknown items
 
        -- Interaction callbacks
        on_place = redef_wrapper(core, 'item_place'),
+       on_secondary_use = redef_wrapper(core, 'item_secondary_use'),
        on_drop = nil,
        on_use = nil,
 }