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

[oweals/minetest.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index 5fcf2a36548085d9d7809e89b27a872b4a9fc38d..7aac1e6a06a10102d4327a429f2904ed8363c5fa 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -26,14 +26,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "util/string.h"
 #include "util/container.h"
 
-#define MAPGEN_DEFAULT MAPGEN_V6
-#define MAPGEN_DEFAULT_NAME "v6"
+#define MAPGEN_DEFAULT MAPGEN_V7
+#define MAPGEN_DEFAULT_NAME "v7"
 
 /////////////////// Mapgen flags
-#define MG_TREES       0x01
+#define MG_TREES       0x01  // Deprecated. Moved into mgv6 flags
 #define MG_CAVES       0x02
 #define MG_DUNGEONS    0x04
-#define MG_FLAT        0x08
+#define MG_FLAT        0x08  // Deprecated. Moved into mgv6 flags
 #define MG_LIGHT       0x10
 #define MG_DECORATIONS 0x20
 
@@ -266,8 +266,9 @@ 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;
+       content_t c_stair_sandstone_block;
 
        int ystride;
        int zstride;