mirror of
https://github.com/minetest/minetest_game.git
synced 2024-11-20 08:30:21 +01:00
Fix merge conflict
This commit is contained in:
parent
f3e1834fe9
commit
e09e82cb8a
@ -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", {
|
||||
|
Loading…
Reference in New Issue
Block a user