diff options
| author | paramat <mat.gregory@virginmedia.com> | 2017-02-04 04:28:02 +0000 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-02-04 07:21:23 +0000 |
| commit | 8e4c11406e20a29ad659b99c840b5281941ae585 (patch) | |
| tree | 0362291d339a892c7c979786ed8695e6eaf3dad1 /src | |
| parent | 2d03cfd24c89c66e5ace4f335dae42f7c2c84f6b (diff) | |
| download | minetest-8e4c11406e20a29ad659b99c840b5281941ae585.tar.gz minetest-8e4c11406e20a29ad659b99c840b5281941ae585.tar.bz2 minetest-8e4c11406e20a29ad659b99c840b5281941ae585.zip | |
Mgv6: Add stairs to desert stone dungeons
As with the other mapgens, now that wide stairs in dungeons are
possible we can now finally add stairs to desert stone dungeons.
Re-order some lines.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapgen_v6.cpp | 26 | ||||
| -rw-r--r-- | src/mapgen_v6.h | 1 |
2 files changed, 16 insertions, 11 deletions
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 79617a830..d4e3fa8d7 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -99,18 +99,10 @@ MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge) c_snowblock = ndef->getId("mapgen_snowblock"); c_ice = ndef->getId("mapgen_ice"); - c_cobble = ndef->getId("mapgen_cobble"); - c_stair_cobble = ndef->getId("mapgen_stair_cobble"); - c_mossycobble = ndef->getId("mapgen_mossycobble"); - - if (c_desert_sand == CONTENT_IGNORE) - c_desert_sand = c_sand; if (c_desert_stone == CONTENT_IGNORE) c_desert_stone = c_stone; - if (c_mossycobble == CONTENT_IGNORE) - c_mossycobble = c_cobble; - if (c_stair_cobble == CONTENT_IGNORE) - c_stair_cobble = c_cobble; + if (c_desert_sand == CONTENT_IGNORE) + c_desert_sand = c_sand; if (c_dirt_with_snow == CONTENT_IGNORE) c_dirt_with_snow = c_dirt_with_grass; if (c_snow == CONTENT_IGNORE) @@ -119,6 +111,18 @@ MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge) c_snowblock = c_dirt_with_grass; if (c_ice == CONTENT_IGNORE) c_ice = c_water_source; + + 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"); + + if (c_mossycobble == CONTENT_IGNORE) + c_mossycobble = c_cobble; + if (c_stair_cobble == CONTENT_IGNORE) + c_stair_cobble = c_cobble; + if (c_stair_desert_stone == CONTENT_IGNORE) + c_stair_desert_stone = c_desert_stone; } @@ -571,7 +575,7 @@ void MapgenV6::makeChunk(BlockMakeData *data) if (getBiome(0, v2s16(node_min.X, node_min.Z)) == BT_DESERT) { 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); diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index f018ffaca..44591e3dc 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -123,6 +123,7 @@ public: content_t c_cobble; content_t c_mossycobble; content_t c_stair_cobble; + content_t c_stair_desert_stone; MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge); ~MapgenV6(); |