diff options
| author | paramat <mat.gregory@virginmedia.com> | 2015-05-12 02:20:18 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2015-05-12 04:40:53 +0100 |
| commit | 02805af36ed4f3f11738c5439b5edd9e1db659ea (patch) | |
| tree | 9a7ffa4da92d53563eaa9786498fc51234adfc73 /src/mapgen_v5.cpp | |
| parent | 82e35edff52d88dcd64a9bfc9d2c4c93f1341b78 (diff) | |
| download | minetest-02805af36ed4f3f11738c5439b5edd9e1db659ea.tar.gz minetest-02805af36ed4f3f11738c5439b5edd9e1db659ea.tar.bz2 minetest-02805af36ed4f3f11738c5439b5edd9e1db659ea.zip | |
Mapgen v5/6/7: Cleanup node resolver and aliases
Diffstat (limited to 'src/mapgen_v5.cpp')
| -rw-r--r-- | src/mapgen_v5.cpp | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index 887ce2a5d..6985e0a1a 100644 --- a/src/mapgen_v5.cpp +++ b/src/mapgen_v5.cpp @@ -79,30 +79,28 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge) //// Resolve nodes to be used INodeDefManager *ndef = emerge->ndef; - c_stone = ndef->getId("mapgen_stone"); - c_dirt = ndef->getId("mapgen_dirt"); - c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass"); - c_sand = ndef->getId("mapgen_sand"); - c_water_source = ndef->getId("mapgen_water_source"); - c_lava_source = ndef->getId("mapgen_lava_source"); - c_gravel = ndef->getId("mapgen_gravel"); - c_cobble = ndef->getId("mapgen_cobble"); - c_ice = ndef->getId("default:ice"); - c_desert_stone = ndef->getId("mapgen_desert_stone"); - c_mossycobble = ndef->getId("mapgen_mossycobble"); - c_sandbrick = ndef->getId("mapgen_sandstonebrick"); - c_stair_cobble = ndef->getId("mapgen_stair_cobble"); - c_stair_sandstone = ndef->getId("mapgen_stair_sandstone"); + c_stone = ndef->getId("mapgen_stone"); + c_water_source = ndef->getId("mapgen_water_source"); + c_lava_source = ndef->getId("mapgen_lava_source"); + c_desert_stone = ndef->getId("mapgen_desert_stone"); + 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"); + c_sandstonebrick = ndef->getId("mapgen_sandstonebrick"); + c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick"); + if (c_ice == CONTENT_IGNORE) c_ice = CONTENT_AIR; if (c_mossycobble == CONTENT_IGNORE) c_mossycobble = c_cobble; - if (c_sandbrick == CONTENT_IGNORE) - c_sandbrick = c_desert_stone; if (c_stair_cobble == CONTENT_IGNORE) c_stair_cobble = c_cobble; - if (c_stair_sandstone == CONTENT_IGNORE) - c_stair_sandstone = c_sandbrick; + if (c_sandstonebrick == CONTENT_IGNORE) + c_sandstonebrick = c_desert_stone; + if (c_stair_sandstonebrick == CONTENT_IGNORE) + c_stair_sandstonebrick = c_sandstonebrick; } @@ -251,27 +249,27 @@ void MapgenV5::makeChunk(BlockMakeData *data) dp.np_rarity = nparams_dungeon_rarity; dp.np_density = nparams_dungeon_density; dp.np_wetness = nparams_dungeon_wetness; - dp.c_water = c_water_source; + dp.c_water = c_water_source; if (desert_stone) { - dp.c_cobble = c_sandbrick; - dp.c_moss = c_sandbrick; // should make this 'cracked sandstone' later - dp.c_stair = c_stair_sandstone; + dp.c_cobble = c_desert_stone; + dp.c_moss = c_desert_stone; + dp.c_stair = c_desert_stone; dp.diagonal_dirs = true; - dp.mossratio = 0.0; - dp.holesize = v3s16(2, 3, 2); - dp.roomsize = v3s16(2, 5, 2); - dp.notifytype = GENNOTIFY_TEMPLE; + dp.mossratio = 0.0; + dp.holesize = v3s16(2, 3, 2); + dp.roomsize = v3s16(2, 5, 2); + dp.notifytype = GENNOTIFY_TEMPLE; } else { - dp.c_cobble = c_cobble; - dp.c_moss = c_mossycobble; - dp.c_stair = c_stair_cobble; + dp.c_cobble = c_cobble; + dp.c_moss = c_mossycobble; + dp.c_stair = c_stair_cobble; dp.diagonal_dirs = false; - dp.mossratio = 3.0; - dp.holesize = v3s16(1, 2, 1); - dp.roomsize = v3s16(0, 0, 0); - dp.notifytype = GENNOTIFY_DUNGEON; + dp.mossratio = 3.0; + dp.holesize = v3s16(1, 2, 1); + dp.roomsize = v3s16(0, 0, 0); + dp.notifytype = GENNOTIFY_DUNGEON; } DungeonGen dgen(this, &dp); |