aboutsummaryrefslogtreecommitdiff
path: root/builtin/game
diff options
context:
space:
mode:
authorWuzzy <wuzzy2@mail.ru>2020-11-15 17:37:09 +0100
committerGitHub <noreply@github.com>2020-11-15 17:37:09 +0100
commitee1853e9bc740a521270e2e113bb4215246382c4 (patch)
tree18471772941b4c0008e8fb502d61fdcb4992f886 /builtin/game
parentad58ece18062d4c545432b45d71ce6dbe841746b (diff)
downloadminetest-ee1853e9bc740a521270e2e113bb4215246382c4.tar.gz
minetest-ee1853e9bc740a521270e2e113bb4215246382c4.tar.bz2
minetest-ee1853e9bc740a521270e2e113bb4215246382c4.zip
Fix falling image of torchlike if paramtype2="none" (#10612)
Diffstat (limited to 'builtin/game')
-rw-r--r--builtin/game/falling.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 4bfcca9e7..8d044beaa 100644
--- 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"