From 00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Fri, 12 Dec 2014 02:38:39 -0500 Subject: [PATCH] Mapgens: Rename m_emerge to prevent name collisions --- src/mapgen_v5.cpp | 10 +++++----- src/mapgen_v5.h | 2 +- src/mapgen_v6.cpp | 6 +++--- src/mapgen_v6.h | 2 +- src/mapgen_v7.cpp | 10 +++++----- src/mapgen_v7.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/mapgen_v5.cpp b/src/mapgen_v5.cpp index b741ebfba..30979f3f7 100644 --- 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 9f25a940a..ef573c7ff 100644 --- 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 148b4497c..00a896e2a 100644 --- 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 e6d2cdc54..445888242 100644 --- 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 efaf60a6f..dce5f6131 100644 --- 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 1af88ddf5..5c037cf44 100644 --- 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; -- 2.25.1