Use single box for halo mesh

[minetest.git] / src / dungeongen.cpp

diff --git a/src/dungeongen.cpp b/src/dungeongen.cpp
index bfaad9faa3a72f46b9228192a9f46a05fdde404c..ce92319e642040f0cf074d284aa0bbd1bb9dbcf6 100644 (file)
--- a/src/dungeongen.cpp
+++ b/src/dungeongen.cpp
@@ -68,6 +68,8 @@ DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams)
 
        // For mapgens using river water
        dp.c_river_water = mg->ndef->getId("mapgen_river_water_source");
+       if (dp.c_river_water == CONTENT_IGNORE)
+               dp.c_river_water = mg->ndef->getId("mapgen_water_source");
 }
 
 
@@ -392,7 +394,8 @@ void DungeonGen::makeCorridor(v3s16 doorplace, v3s16 doordir,
                if (partcount != 0)
                        p.Y += make_stairs;
 
-               if (vm->m_area.contains(p) && vm->m_area.contains(p + v3s16(0, 1, 0))) {
+               if (vm->m_area.contains(p) && vm->m_area.contains(p + v3s16(0, 1, 0)) &&
+                               vm->m_area.contains(v3s16(p.X - dir.X, p.Y - 1, p.Z - dir.Z))) {
                        if (make_stairs) {
                                makeFill(p + v3s16(-1, -1, -1),
                                        dp.holesize + v3s16(2, 3, 2),