minetest
/
minetest_game
mirror of https://github.com/minetest/minetest_game.git
1
0
Fork 2
Code Issues Releases Wiki Activity

Fix merge conflict

This commit is contained in:
An0n3m0us 2022-01-30 09:57:40 +00:00
parent f3e1834fe9
commit e09e82cb8a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mods/doors/init.lua
View File

@ -444,14 +444,25 @@ function doors.register(name, def)
def.collision_box = {type = "fixed", fixed = {-1/2,-1/2,-1/2,1/2,3/2,-6/16}}
def.model = def.model or "door"
def.mesh = def.model .. "_a.obj"
minetest.register_node(":" .. name .. "_a", def)
def.mesh = def.model .. "_a.b3d"
minetest.register_node(":" .. name .. "_a", table.copy(def))
def.mesh = def.model .. "_b.obj"
minetest.register_node(":" .. name .. "_b", def)
def.model = def.model or "door"
def.mesh = def.model .. "_b.b3d"
minetest.register_node(":" .. name .. "_b", table.copy(def))
def.model = def.model or "door"
def.mesh = def.model .. "_b.b3d"
minetest.register_node(":" .. name .. "_c", table.copy(def))
def.model = def.model or "door"
def.mesh = def.model .. "_a.b3d"
minetest.register_node(":" .. name .. "_d", table.copy(def))
doors.registered_doors[name .. "_a"] = true
doors.registered_doors[name .. "_b"] = true
doors.registered_doors[name .. "_c"] = true
doors.registered_doors[name .. "_d"] = true
end
doors.register("door_wood", {