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_v6.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_v6.cpp')
| -rw-r--r-- | src/mapgen_v6.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) |