Dungeons: Mostly fix missing stair nodes
This commit is contained in:
parent
0088fa6db4
commit
ebfdb21624
|
@ -431,8 +431,10 @@ void DungeonGen::makeCorridor(v3s16 doorplace, v3s16 doordir,
|
|||
VMANIP_FLAG_DUNGEON_UNTOUCHABLE,
|
||||
MapNode(dp.c_wall),
|
||||
0);
|
||||
makeHole(p);
|
||||
makeHole(p - dir);
|
||||
makeFill(p, dp.holesize, VMANIP_FLAG_DUNGEON_UNTOUCHABLE,
|
||||
MapNode(CONTENT_AIR), VMANIP_FLAG_DUNGEON_INSIDE);
|
||||
makeFill(p - dir, dp.holesize, VMANIP_FLAG_DUNGEON_UNTOUCHABLE,
|
||||
MapNode(CONTENT_AIR), VMANIP_FLAG_DUNGEON_INSIDE);
|
||||
|
||||
// TODO: fix stairs code so it works 100%
|
||||
// (quite difficult)
|
||||
|
@ -451,16 +453,21 @@ void DungeonGen::makeCorridor(v3s16 doorplace, v3s16 doordir,
|
|||
v3s16 swv = (dir.Z != 0) ? v3s16(1, 0, 0) : v3s16(0, 0, 1);
|
||||
|
||||
for (u16 st = 0; st < stair_width; st++) {
|
||||
if (make_stairs == -1) {
|
||||
u32 vi = vm->m_area.index(ps.X - dir.X, ps.Y - 1, ps.Z - dir.Z);
|
||||
if (vm->m_area.contains(ps + v3s16(-dir.X, -1, -dir.Z)) &&
|
||||
vm->m_data[vi].getContent() == dp.c_wall)
|
||||
vm->m_data[vi].getContent() == dp.c_wall) {
|
||||
vm->m_flags[vi] |= VMANIP_FLAG_DUNGEON_UNTOUCHABLE;
|
||||
vm->m_data[vi] = MapNode(dp.c_stair, 0, facedir);
|
||||
|
||||
vi = vm->m_area.index(ps.X, ps.Y, ps.Z);
|
||||
if (vm->m_area.contains(ps) &&
|
||||
vm->m_data[vi].getContent() == dp.c_wall)
|
||||
}
|
||||
} else if (make_stairs == 1) {
|
||||
u32 vi = vm->m_area.index(ps.X, ps.Y - 1, ps.Z);
|
||||
if (vm->m_area.contains(ps + v3s16(0, -1, 0)) &&
|
||||
vm->m_data[vi].getContent() == dp.c_wall) {
|
||||
vm->m_flags[vi] |= VMANIP_FLAG_DUNGEON_UNTOUCHABLE;
|
||||
vm->m_data[vi] = MapNode(dp.c_stair, 0, facedir);
|
||||
|
||||
}
|
||||
}
|
||||
ps += swv;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue