mapgen: drop mapgen id from child mapgens.

This id must be owned by the child mapgen and never be set to a misc value by a developer

Also use nullptr in some places

diff --git a/src/map_settings_manager.cpp b/src/map_settings_manager.cpp
index 16e7d8230bd3b8778dce8a4081b0f264e5d534f0..a0ff1c754f7d9c85414b7fbb4b8f8eac6c1468bc 100644 (file)
--- a/src/map_settings_manager.cpp
+++ b/src/map_settings_manager.cpp
@@ -174,8 +174,8 @@ MapgenParams *MapSettingsManager::makeMapgenParams()
 
        // Create our MapgenParams
        MapgenParams *params = Mapgen::createMapgenParams(mgtype);
-       if (params == NULL)
-               return NULL;
+       if (!params)
+               return nullptr;
 
        params->mgtype = mgtype;
 

diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp
index 7de367a27e4ce1079c813138414e6ff757c47a5f..c46ff7c83d8dcfd747035e1d67a05d24f7ff77b3 100644 (file)
--- a/src/mapgen/mapgen.cpp
+++ b/src/mapgen/mapgen.cpp
@@ -153,23 +153,23 @@ Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
 {
        switch (mgtype) {
        case MAPGEN_CARPATHIAN:
-               return new MapgenCarpathian(mgid, (MapgenCarpathianParams *)params, emerge);
+               return new MapgenCarpathian((MapgenCarpathianParams *)params, emerge);
        case MAPGEN_FLAT:
-               return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
+               return new MapgenFlat((MapgenFlatParams *)params, emerge);
        case MAPGEN_FRACTAL:
-               return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
+               return new MapgenFractal((MapgenFractalParams *)params, emerge);
        case MAPGEN_SINGLENODE:
-               return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
+               return new MapgenSinglenode((MapgenSinglenodeParams *)params, emerge);
        case MAPGEN_V5:
-               return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
+               return new MapgenV5((MapgenV5Params *)params, emerge);
        case MAPGEN_V6:
-               return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
+               return new MapgenV6((MapgenV6Params *)params, emerge);
        case MAPGEN_V7:
-               return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
+               return new MapgenV7((MapgenV7Params *)params, emerge);
        case MAPGEN_VALLEYS:
-               return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
+               return new MapgenValleys((MapgenValleysParams *)params, emerge);
        default:
-               return NULL;
+               return nullptr;
        }
 }
 
@@ -194,7 +194,7 @@ MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
        case MAPGEN_VALLEYS:
                return new MapgenValleysParams;
        default:
-               return NULL;
+               return nullptr;
        }
 }
 

diff --git a/src/mapgen/mapgen_carpathian.cpp b/src/mapgen/mapgen_carpathian.cpp
index f7daef7081c8ed27da9479370ff0bbc134fe0480..3a69fb5b819a8e00affefff60882736c7af80674 100644 (file)
--- a/src/mapgen/mapgen_carpathian.cpp
+++ b/src/mapgen/mapgen_carpathian.cpp
@@ -50,9 +50,8 @@ FlagDesc flagdesc_mapgen_carpathian[] = {
 ///////////////////////////////////////////////////////////////////////////////
 
 
-MapgenCarpathian::MapgenCarpathian(
-               int mapgenid, MapgenCarpathianParams *params, EmergeManager *emerge)
-       : MapgenBasic(mapgenid, params, emerge)
+MapgenCarpathian::MapgenCarpathian(MapgenCarpathianParams *params, EmergeManager *emerge)
+       : MapgenBasic(MAPGEN_CARPATHIAN, params, emerge)
 {
        base_level       = params->base_level;
 

diff --git a/src/mapgen/mapgen_carpathian.h b/src/mapgen/mapgen_carpathian.h
index c32212c9af4ae9196c7525f09c887af54538e322..3f61b7d22e14481b52634371b31c9033758687a9 100644 (file)
--- a/src/mapgen/mapgen_carpathian.h
+++ b/src/mapgen/mapgen_carpathian.h
@@ -71,8 +71,7 @@ struct MapgenCarpathianParams : public MapgenParams
 class MapgenCarpathian : public MapgenBasic
 {
 public:
-       MapgenCarpathian(int mapgenid, MapgenCarpathianParams *params,
-                       EmergeManager *emerge);
+       MapgenCarpathian(MapgenCarpathianParams *params, EmergeManager *emerge);
        ~MapgenCarpathian();
 
        virtual MapgenType getType() const { return MAPGEN_CARPATHIAN; }

diff --git a/src/mapgen/mapgen_flat.cpp b/src/mapgen/mapgen_flat.cpp
index 11b27f85ce9f0d92c04ec9d4ba04c7aac4d7e589..e31dc47033b395dc7e3f272c54133d629b9c1f0b 100644 (file)
--- a/src/mapgen/mapgen_flat.cpp
+++ b/src/mapgen/mapgen_flat.cpp
@@ -48,8 +48,8 @@ FlagDesc flagdesc_mapgen_flat[] = {
 ///////////////////////////////////////////////////////////////////////////////////////
 
 
-MapgenFlat::MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge)
-       : MapgenBasic(mapgenid, params, emerge)
+MapgenFlat::MapgenFlat(MapgenFlatParams *params, EmergeManager *emerge)
+       : MapgenBasic(MAPGEN_FLAT, params, emerge)
 {
        spflags          = params->spflags;
        ground_level     = params->ground_level;

diff --git a/src/mapgen/mapgen_flat.h b/src/mapgen/mapgen_flat.h
index d8ec9f12678c84c48ab2609de21be913551b42bc..e9bd611e4026de2f87b5f820ec0f028816944099 100644 (file)
--- a/src/mapgen/mapgen_flat.h
+++ b/src/mapgen/mapgen_flat.h
@@ -59,7 +59,7 @@ struct MapgenFlatParams : public MapgenParams
 class MapgenFlat : public MapgenBasic
 {
 public:
-       MapgenFlat(int mapgenid, MapgenFlatParams *params, EmergeManager *emerge);
+       MapgenFlat(MapgenFlatParams *params, EmergeManager *emerge);
        ~MapgenFlat();
 
        virtual MapgenType getType() const { return MAPGEN_FLAT; }

diff --git a/src/mapgen/mapgen_fractal.cpp b/src/mapgen/mapgen_fractal.cpp
index 68a66bba9937933a31892adea5472cb9a7a8e551..47699b8a28d786345abc53fd7cd9408efd799c8b 100644 (file)
--- a/src/mapgen/mapgen_fractal.cpp
+++ b/src/mapgen/mapgen_fractal.cpp
@@ -47,8 +47,8 @@ FlagDesc flagdesc_mapgen_fractal[] = {
 ///////////////////////////////////////////////////////////////////////////////////////
 
 
-MapgenFractal::MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge)
-       : MapgenBasic(mapgenid, params, emerge)
+MapgenFractal::MapgenFractal(MapgenFractalParams *params, EmergeManager *emerge)
+       : MapgenBasic(MAPGEN_FRACTAL, params, emerge)
 {
        spflags          = params->spflags;
        cave_width       = params->cave_width;

diff --git a/src/mapgen/mapgen_fractal.h b/src/mapgen/mapgen_fractal.h
index 5a1948b9ab128d59a550511310d995e6732067a2..da250c1e9ac36c130e45f038216edc96f2775f6d 100644 (file)
--- a/src/mapgen/mapgen_fractal.h
+++ b/src/mapgen/mapgen_fractal.h
@@ -62,7 +62,7 @@ struct MapgenFractalParams : public MapgenParams
 class MapgenFractal : public MapgenBasic
 {
 public:
-       MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge);
+       MapgenFractal(MapgenFractalParams *params, EmergeManager *emerge);
        ~MapgenFractal();
 
        virtual MapgenType getType() const { return MAPGEN_FRACTAL; }

diff --git a/src/mapgen/mapgen_singlenode.cpp b/src/mapgen/mapgen_singlenode.cpp
index 76f7e6e8e98b73bbdfcc8813595f43af1b719a90..b64524e1c641dd8d0987a1b56e24a6c4468b78f5 100644 (file)
--- a/src/mapgen/mapgen_singlenode.cpp
+++ b/src/mapgen/mapgen_singlenode.cpp
@@ -29,9 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "emerge.h"
 
 
-MapgenSinglenode::MapgenSinglenode(int mapgenid,
-       MapgenParams *params, EmergeManager *emerge)
-       : Mapgen(mapgenid, params, emerge)
+MapgenSinglenode::MapgenSinglenode(MapgenParams *params, EmergeManager *emerge)
+       : Mapgen(MAPGEN_SINGLENODE, params, emerge)
 {
        const NodeDefManager *ndef = emerge->ndef;
 

diff --git a/src/mapgen/mapgen_singlenode.h b/src/mapgen/mapgen_singlenode.h
index ebfb3c72945b298224e166c9c754d00039368c79..c21089eda2510a68ebec999c0acbcc71d1fd41fb 100644 (file)
--- a/src/mapgen/mapgen_singlenode.h
+++ b/src/mapgen/mapgen_singlenode.h
@@ -38,7 +38,7 @@ public:
        content_t c_node;
        u8 set_light;
 
-       MapgenSinglenode(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+       MapgenSinglenode(MapgenParams *params, EmergeManager *emerge);
        ~MapgenSinglenode() = default;
 
        virtual MapgenType getType() const { return MAPGEN_SINGLENODE; }

diff --git a/src/mapgen/mapgen_v5.cpp b/src/mapgen/mapgen_v5.cpp
index c5be727b97b1ba70d814e4097fcc81a9acfb7451..eded332cac52e262d8de575c3635e49ea8d1e4d8 100644 (file)
--- a/src/mapgen/mapgen_v5.cpp
+++ b/src/mapgen/mapgen_v5.cpp
@@ -45,8 +45,8 @@ FlagDesc flagdesc_mapgen_v5[] = {
 };
 
 
-MapgenV5::MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge)
-       : MapgenBasic(mapgenid, params, emerge)
+MapgenV5::MapgenV5(MapgenV5Params *params, EmergeManager *emerge)
+       : MapgenBasic(MAPGEN_V5, params, emerge)
 {
        spflags          = params->spflags;
        cave_width       = params->cave_width;

diff --git a/src/mapgen/mapgen_v5.h b/src/mapgen/mapgen_v5.h
index a1b56a0704cc6f9b2ffbd5334f3e653b93eb5f87..023d8308d55072459b9e7b2a670d91156e9a703c 100644 (file)
--- a/src/mapgen/mapgen_v5.h
+++ b/src/mapgen/mapgen_v5.h
@@ -59,7 +59,7 @@ struct MapgenV5Params : public MapgenParams
 class MapgenV5 : public MapgenBasic
 {
 public:
-       MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge);
+       MapgenV5(MapgenV5Params *params, EmergeManager *emerge);
        ~MapgenV5();
 
        virtual MapgenType getType() const { return MAPGEN_V5; }

diff --git a/src/mapgen/mapgen_v6.cpp b/src/mapgen/mapgen_v6.cpp
index fdfebe575bd0b5a624a4a39dedbc1a7e82dd60fa..2b73c2975b1da15fdff944c163668605027d6146 100644 (file)
--- a/src/mapgen/mapgen_v6.cpp
+++ b/src/mapgen/mapgen_v6.cpp
@@ -55,8 +55,8 @@ FlagDesc flagdesc_mapgen_v6[] = {
 /////////////////////////////////////////////////////////////////////////////
 
 
-MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
-       : Mapgen(mapgenid, params, emerge)
+MapgenV6::MapgenV6(MapgenV6Params *params, EmergeManager *emerge)
+       : Mapgen(MAPGEN_V6, params, emerge)
 {
        m_emerge = emerge;
        ystride = csize.X; //////fix this

diff --git a/src/mapgen/mapgen_v6.h b/src/mapgen/mapgen_v6.h
index 056281f2fcaed1a4249b3fce69d5f318333be587..8420579039fe629844ee2ac0becfd89f569a1e78 100644 (file)
--- a/src/mapgen/mapgen_v6.h
+++ b/src/mapgen/mapgen_v6.h
@@ -132,7 +132,7 @@ public:
        content_t c_stair_cobble;
        content_t c_stair_desert_stone;
 
-       MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
+       MapgenV6(MapgenV6Params *params, EmergeManager *emerge);
        ~MapgenV6();
 
        virtual MapgenType getType() const { return MAPGEN_V6; }

diff --git a/src/mapgen/mapgen_v7.cpp b/src/mapgen/mapgen_v7.cpp
index 1354bf25664a391f628e7b43226e3b0c7cef8dd4..ad5220925f48341f5f8c95b68754f47a8ae9c52f 100644 (file)
--- a/src/mapgen/mapgen_v7.cpp
+++ b/src/mapgen/mapgen_v7.cpp
@@ -52,8 +52,8 @@ FlagDesc flagdesc_mapgen_v7[] = {
 ////////////////////////////////////////////////////////////////////////////////
 
 
-MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
-       : MapgenBasic(mapgenid, params, emerge)
+MapgenV7::MapgenV7(MapgenV7Params *params, EmergeManager *emerge)
+       : MapgenBasic(MAPGEN_V7, params, emerge)
 {
        spflags              = params->spflags;
        mount_zero_level     = params->mount_zero_level;

diff --git a/src/mapgen/mapgen_v7.h b/src/mapgen/mapgen_v7.h
index b55c80d3a72032e24f08c63cb4ae9a0cc4841576..f61da2b79c7149ffefcbf6c067b27347d213cd91 100644 (file)
--- a/src/mapgen/mapgen_v7.h
+++ b/src/mapgen/mapgen_v7.h
@@ -77,7 +77,7 @@ struct MapgenV7Params : public MapgenParams {
 
 class MapgenV7 : public MapgenBasic {
 public:
-       MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
+       MapgenV7(MapgenV7Params *params, EmergeManager *emerge);
        ~MapgenV7();
 
        virtual MapgenType getType() const { return MAPGEN_V7; }

diff --git a/src/mapgen/mapgen_valleys.cpp b/src/mapgen/mapgen_valleys.cpp
index a27a3120184ba85de71fc9cc69c645fd8716a7e0..b8eb5b5f966b8d6b2e9861e10fc14147f18bb395 100644 (file)
--- a/src/mapgen/mapgen_valleys.cpp
+++ b/src/mapgen/mapgen_valleys.cpp
@@ -54,9 +54,8 @@ FlagDesc flagdesc_mapgen_valleys[] = {
 };
 
 
-MapgenValleys::MapgenValleys(int mapgenid, MapgenValleysParams *params,
-       EmergeManager *emerge)
-       : MapgenBasic(mapgenid, params, emerge)
+MapgenValleys::MapgenValleys(MapgenValleysParams *params, EmergeManager *emerge)
+       : MapgenBasic(MAPGEN_VALLEYS, params, emerge)
 {
        // NOTE: MapgenValleys has a hard dependency on BiomeGenOriginal
        m_bgen = (BiomeGenOriginal *)biomegen;

diff --git a/src/mapgen/mapgen_valleys.h b/src/mapgen/mapgen_valleys.h
index 06920a477e01016ae0aba77bac1e455ccd2841f4..fd40b5bab03a0734844e81e5e06f0a6a71d38209 100644 (file)
--- a/src/mapgen/mapgen_valleys.h
+++ b/src/mapgen/mapgen_valleys.h
@@ -79,7 +79,7 @@ struct MapgenValleysParams : public MapgenParams {
 class MapgenValleys : public MapgenBasic {
 public:
 
-       MapgenValleys(int mapgenid, MapgenValleysParams *params,
+       MapgenValleys(MapgenValleysParams *params,
                EmergeManager *emerge);
        ~MapgenValleys();