Mapgens: Rename m_emerge to prevent name collisions

diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp
index b741ebfba75ead0f4bc39dd32d6167f68ab4d59e..30979f3f70f9b6469037feae5d2e31f3cc697c29 100644 (file)
--- a/src/mapgen_v5.cpp
+++ b/src/mapgen_v5.cpp
@@ -50,8 +50,8 @@ FlagDesc flagdesc_mapgen_v5[] = {
 MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
        : Mapgen(mapgenid, params, emerge)
 {
-       this->emerge = emerge;
-       this->bmgr   = emerge->biomemgr;
+       this->m_emerge = emerge;
+       this->bmgr     = emerge->biomemgr;
 
        // amount of elements to skip for the next index
        // for noise/height/biome maps (not vmanip)
@@ -240,7 +240,7 @@ void MapgenV5::makeChunk(BlockMakeData *data) {
        full_node_max = (blockpos_max + 2) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
 
        // Create a block-specific seed
-       blockseed = emerge->getBlockSeed(full_node_min);  //////use getBlockSeed2()!
+       blockseed = m_emerge->getBlockSeed(full_node_min);  //////use getBlockSeed2()!
 
        // Make some noise
        calculateNoise();
@@ -268,10 +268,10 @@ void MapgenV5::makeChunk(BlockMakeData *data) {
        }
 
        // Generate the registered decorations
-       emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
+       m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
 
        // Generate the registered ores
-       emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
+       m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
 
        // Sprinkle some dust on top after everything else was generated
        dustTopNodes();

diff --git a/src/mapgen_v5.h b/src/mapgen_v5.h
index 9f25a940adc543ab6f6face13d7174a1401ceb1a..ef573c7ff7d329356e6e463ca1d6a0aae718d774 100644 (file)
--- a/src/mapgen_v5.h
+++ b/src/mapgen_v5.h
@@ -49,7 +49,7 @@ struct MapgenV5Params : public MapgenSpecificParams {
 
 class MapgenV5 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
        BiomeManager *bmgr;
 
        int ystride;

diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index 148b4497cde0a4c55b99f852a0825c49a5dbaeea..00a896e2a7ef355ffaa0fd7f181bf78cb28301ab 100644 (file)
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -52,7 +52,7 @@ FlagDesc flagdesc_mapgen_v6[] = {
 MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge)
        : Mapgen(mapgenid, params, emerge)
 {
-       this->emerge  = emerge;
+       this->m_emerge = emerge;
        this->ystride = csize.X; //////fix this
 
        MapgenV6Params *sp = (MapgenV6Params *)params->sparams;
@@ -529,10 +529,10 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
                placeTreesAndJungleGrass();
 
        // Generate the registered decorations
-       emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
+       m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
 
        // Generate the registered ores
-       emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
+       m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
 
        // Calculate lighting
        if (flags & MG_LIGHT)

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index e6d2cdc544bfc0ace08dc2ea77f9fadebf9be7bd..445888242b7efccc39efbfa8259171b1396621f5 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -65,7 +65,7 @@ struct MapgenV6Params : public MapgenSpecificParams {
 
 class MapgenV6 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
 
        int ystride;
        u32 spflags;

diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index efaf60a6fa626fc083ffe30ec3c36120509efa80..dce5f613126e6ef7a97ec746c75c2b89c844cee3 100644 (file)
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -52,8 +52,8 @@ FlagDesc flagdesc_mapgen_v7[] = {
 MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
        : Mapgen(mapgenid, params, emerge)
 {
-       this->emerge = emerge;
-       this->bmgr   = emerge->biomemgr;
+       this->m_emerge = emerge;
+       this->bmgr     = emerge->biomemgr;
 
        //// amount of elements to skip for the next index
        //// for noise/height/biome maps (not vmanip)
@@ -215,7 +215,7 @@ void MapgenV7::makeChunk(BlockMakeData *data) {
        full_node_min = (blockpos_min - 1) * MAP_BLOCKSIZE;
        full_node_max = (blockpos_max + 2) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
 
-       blockseed = emerge->getBlockSeed(full_node_min);  //////use getBlockSeed2()!
+       blockseed = m_emerge->getBlockSeed(full_node_min);  //////use getBlockSeed2()!
 
        // Make some noise
        calculateNoise();
@@ -241,10 +241,10 @@ void MapgenV7::makeChunk(BlockMakeData *data) {
        }
 
        // Generate the registered decorations
-       emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
+       m_emerge->decomgr->placeAllDecos(this, blockseed, node_min, node_max);
 
        // Generate the registered ores
-       emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
+       m_emerge->oremgr->placeAllOres(this, blockseed, node_min, node_max);
 
        // Sprinkle some dust on top after everything else was generated
        dustTopNodes();

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 1af88ddf5b0a67b2996dd4d43f3fe214d5560327..5c037cf440e2052c10bc60005942b6fd0f7a8c69 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -52,7 +52,7 @@ struct MapgenV7Params : public MapgenSpecificParams {
 
 class MapgenV7 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
        BiomeManager *bmgr;
 
        int ystride;