oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Mapgens: Rename m_emerge to prevent name collisions

Browse source
This commit is contained in:
kwolekr 2014-12-12 02:38:39 -05:00
parent 2b8180a417
commit 00fc0babe0
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/mapgen_v5.cpp
View file

@ -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();