aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparamat <mat.gregory@virginmedia.com>2017-01-23 08:07:34 +0000
committerparamat <mat.gregory@virginmedia.com>2017-01-26 20:18:54 +0000
commitae929ce2fdcfcfc95cffece35f3d38ea4d96dd9f (patch)
tree20229f26bd31761ad246d724fd1eb3adc406f532
parentc268db7b46645b8000bd77ce80e919080a75f152 (diff)
downloadminetest-ae929ce2fdcfcfc95cffece35f3d38ea4d96dd9f.tar.gz
minetest-ae929ce2fdcfcfc95cffece35f3d38ea4d96dd9f.tar.bz2
minetest-ae929ce2fdcfcfc95cffece35f3d38ea4d96dd9f.zip
Dungeons: Add nodebox stairs to desert and sandstone dungeons
Desert and sandstone dungeons have 2 node wide corridors. Previously, nodebox stairs were disabled because dungeon generation code did not support nodebox stairs wider than 1 node, now it does. Add 'stair desert stone' content id to MappgenBasic. Requires 'mapgen stair desert stone' to be added to Minetest Game.
-rw-r--r--src/mapgen.cpp5
-rw-r--r--src/mapgen.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index fd4f5858f..e42fc7467 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -604,6 +604,7 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emer
c_cobble = ndef->getId("mapgen_cobble");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_mossycobble = ndef->getId("mapgen_mossycobble");
+ c_stair_desert_stone = ndef->getId("mapgen_stair_desert_stone");
c_sandstonebrick = ndef->getId("mapgen_sandstonebrick");
c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
@@ -867,7 +868,7 @@ void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
case MGSTONE_DESERT_STONE:
dp.c_wall = c_desert_stone;
dp.c_alt_wall = CONTENT_IGNORE;
- dp.c_stair = c_desert_stone;
+ dp.c_stair = c_stair_desert_stone;
dp.diagonal_dirs = true;
dp.holesize = v3s16(2, 3, 2);
@@ -877,7 +878,7 @@ void MapgenBasic::generateDungeons(s16 max_stone_y, MgStoneType stone_type)
case MGSTONE_SANDSTONE:
dp.c_wall = c_sandstonebrick;
dp.c_alt_wall = CONTENT_IGNORE;
- dp.c_stair = c_sandstonebrick;
+ dp.c_stair = c_stair_sandstonebrick;
dp.diagonal_dirs = false;
dp.holesize = v3s16(2, 2, 2);
diff --git a/src/mapgen.h b/src/mapgen.h
index b18bfb930..a95e1942a 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -266,6 +266,7 @@ protected:
content_t c_cobble;
content_t c_stair_cobble;
content_t c_mossycobble;
+ content_t c_stair_desert_stone;
content_t c_sandstonebrick;
content_t c_stair_sandstonebrick;