Fix falling image of torchlike if paramtype2="none" (#10612)

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 4bfcca9e7747be4a0ed83ef96eec27f1ee1a705c..8d044beaa1607387c3c6eb8e3fe6b0ee5dbd4b55 100644 (file)
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -84,6 +84,9 @@ core.register_entity(":__builtin:falling_node", {
                        local textures
                        if def.tiles and def.tiles[1] then
                                local tile = def.tiles[1]
+                               if def.drawtype == "torchlike" and def.paramtype2 ~= "wallmounted" then
+                                       tile = def.tiles[2] or def.tiles[1]
+                               end
                                if type(tile) == "table" then
                                        tile = tile.name
                                end
@@ -144,7 +147,11 @@ core.register_entity(":__builtin:falling_node", {
 
                -- Rotate entity
                if def.drawtype == "torchlike" then
-                       self.object:set_yaw(math.pi*0.25)
+                       if def.paramtype2 == "wallmounted" then
+                               self.object:set_yaw(math.pi*0.25)
+                       else
+                               self.object:set_yaw(-math.pi*0.25)
+                       end
                elseif (node.param2 ~= 0 and (def.wield_image == ""
                                or def.wield_image == nil))
                                or def.drawtype == "signlike"

diff --git a/games/devtest/mods/testnodes/drawtypes.lua b/games/devtest/mods/testnodes/drawtypes.lua
index 82d862819738f42a877b127a3c960eb8012678e6..b3ab2b322e6dfb89647111abe9fc7740a00e16d5 100644 (file)
--- a/games/devtest/mods/testnodes/drawtypes.lua
+++ b/games/devtest/mods/testnodes/drawtypes.lua
@@ -145,6 +145,23 @@ minetest.register_node("testnodes:fencelike", {
 })
 
 minetest.register_node("testnodes:torchlike", {
+       description = S("Torchlike Drawtype Test Node"),
+       drawtype = "torchlike",
+       paramtype = "light",
+       tiles = {
+               "testnodes_torchlike_floor.png",
+               "testnodes_torchlike_ceiling.png",
+               "testnodes_torchlike_wall.png",
+       },
+
+
+       walkable = false,
+       sunlight_propagates = true,
+       groups = { dig_immediate = 3 },
+       inventory_image = fallback_image("testnodes_torchlike_floor.png"),
+})
+
+minetest.register_node("testnodes:torchlike_wallmounted", {
        description = S("Wallmounted Torchlike Drawtype Test Node"),
        drawtype = "torchlike",
        paramtype = "light",
@@ -162,6 +179,8 @@ minetest.register_node("testnodes:torchlike", {
        inventory_image = fallback_image("testnodes_torchlike_floor.png"),
 })
 
+
+
 minetest.register_node("testnodes:signlike", {
        description = S("Wallmounted Signlike Drawtype Test Node"),
        drawtype = "signlike",
@@ -526,7 +545,7 @@ scale("allfaces_optional_waving",
 scale("plantlike",
        S("Double-sized Plantlike Drawtype Test Node"),
        S("Half-sized Plantlike Drawtype Test Node"))
-scale("torchlike",
+scale("torchlike_wallmounted",
        S("Double-sized Wallmounted Torchlike Drawtype Test Node"),
        S("Half-sized Wallmounted Torchlike Drawtype Test Node"))
 scale("signlike",