Dungeons: Use 'block' instead of 'brick' for nodebox stairs

Affects only sandstone dungeons. Nodebox stairs made from
'sandstone_block' look better because every step is undivided.

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index e1e3ccd25b171f680c89c74958986b20c47f6fa8..a0b9990b7467ab2c50a644dd5a250ffe9c2e565b 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -601,12 +601,12 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emer
                c_sandstone = c_stone;
 
        //// Content used for dungeon generation
-       c_cobble               = ndef->getId("mapgen_cobble");
-       c_mossycobble          = ndef->getId("mapgen_mossycobble");
-       c_stair_cobble         = ndef->getId("mapgen_stair_cobble");
-       c_stair_desert_stone   = ndef->getId("mapgen_stair_desert_stone");
-       c_sandstonebrick       = ndef->getId("mapgen_sandstonebrick");
-       c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
+       c_cobble                = ndef->getId("mapgen_cobble");
+       c_mossycobble           = ndef->getId("mapgen_mossycobble");
+       c_stair_cobble          = ndef->getId("mapgen_stair_cobble");
+       c_stair_desert_stone    = ndef->getId("mapgen_stair_desert_stone");
+       c_sandstonebrick        = ndef->getId("mapgen_sandstonebrick");
+       c_stair_sandstone_block = ndef->getId("mapgen_stair_sandstone_block");
 
        // Fall back to more basic content if not defined
        if (c_mossycobble == CONTENT_IGNORE)
@@ -617,8 +617,8 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emer
                c_stair_desert_stone = c_desert_stone;
        if (c_sandstonebrick == CONTENT_IGNORE)
                c_sandstonebrick = c_sandstone;
-       if (c_stair_sandstonebrick == CONTENT_IGNORE)
-               c_stair_sandstonebrick = c_sandstonebrick;
+       if (c_stair_sandstone_block == CONTENT_IGNORE)
+               c_stair_sandstone_block = c_sandstonebrick;
 }
 
 
@@ -891,7 +891,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_stair_sandstonebrick;
+               dp.c_stair             = c_stair_sandstone_block;
 
                dp.diagonal_dirs       = false;
                dp.holesize            = v3s16(2, 2, 2);

diff --git a/src/mapgen.h b/src/mapgen.h
index a95e1942aeea5d40fdded5eb67c579b068fe736b..7aac1e6a06a10102d4327a429f2904ed8363c5fa 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -268,7 +268,7 @@ protected:
        content_t c_mossycobble;
        content_t c_stair_desert_stone;
        content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
+       content_t c_stair_sandstone_block;
 
        int ystride;
        int zstride;