MapgenBasic: Add lava source as commonly used content (#5512)

Future mapgens are likely to use this for magma and volcanos.
Remove the getting of lava source content id in mgvalleys.

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index c63c426fa186470499bfe0d231aba47d17cd42bb..bd0e94ac7c0e79886f8fd142600de2a201f5c663 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -593,6 +593,7 @@ MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emer
        c_sandstone          = ndef->getId("mapgen_sandstone");
        c_water_source       = ndef->getId("mapgen_water_source");
        c_river_water_source = ndef->getId("mapgen_river_water_source");
+       c_lava_source        = ndef->getId("mapgen_lava_source");
 
        // Fall back to more basic content if not defined
        // river_water_source cannot fallback to water_source because river water

diff --git a/src/mapgen.h b/src/mapgen.h
index f738b1bce6b1a0fc345b0583ecd8a99fc6f5e912..653b79ed82b56adda6519a59847b4a6e5ec9096e 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -261,10 +261,11 @@ protected:
 
        // Content required for generateBiomes
        content_t c_stone;
-       content_t c_water_source;
-       content_t c_river_water_source;
        content_t c_desert_stone;
        content_t c_sandstone;
+       content_t c_water_source;
+       content_t c_river_water_source;
+       content_t c_lava_source;
 
        // Content required for generateDungeons
        content_t c_cobble;

diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp
index 76a7a0582a8d8f7b04510fae9bfd81858c762491..af29eb3bd27e39559236db71b48cf4609553f255 100644 (file)
--- a/src/mapgen_valleys.cpp
+++ b/src/mapgen_valleys.cpp
@@ -107,9 +107,6 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeMa
        this->lava_max_height       = water_level + MYMAX(0, lava_features_lim - 4) * 50;
 
        tcave_cache = new float[csize.Y + 2];
-
-       // Resolve content to be used
-       c_lava_source = ndef->getId("mapgen_lava_source");
 }
 
 

diff --git a/src/mapgen_valleys.h b/src/mapgen_valleys.h
index 4a7a11bcc63f415a54f7435b1b69fb99e170cc89..0c67c3232f137b7a255f677b98fd083f065c06c9 100644 (file)
--- a/src/mapgen_valleys.h
+++ b/src/mapgen_valleys.h
@@ -124,8 +124,6 @@ private:
        Noise *noise_valley_depth;
        Noise *noise_valley_profile;
 
-       content_t c_lava_source;
-
        float terrainLevelAtPoint(s16 x, s16 z);
 
        void calculateNoise();