diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-12-12 02:38:39 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-12-12 02:38:39 -0500 |
| commit | 00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111 (patch) | |
| tree | 59c9d80b4fc2262b051bb3b73b10006dcdac61dc /src/mapgen_v5.cpp | |
| parent | 2b8180a417465845759096670f498bf71cd39403 (diff) | |
| download | minetest-00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111.tar.gz minetest-00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111.tar.bz2 minetest-00fc0babe0c6c5464fa9ffbc5a257b1e2aa93111.zip | |
Mapgens: Rename m_emerge to prevent name collisions
Diffstat (limited to 'src/mapgen_v5.cpp')
| -rw-r--r-- | src/mapgen_v5.cpp | 10 |
1 files changed, 5 insertions, 5 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(); |