From 5b69087b729d91be330662d902a3e351d51789f2 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 27 Jul 2012 21:00:11 +0000 Subject: Removed bottom lava from caves generator, added a new finish generator BottomLava for that. Also fixed a slight error in SameBlock composition generator cfg git-svn-id: http://mc-server.googlecode.com/svn/trunk@698 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Caves.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'source/Caves.cpp') diff --git a/source/Caves.cpp b/source/Caves.cpp index e702e1902..4cc8506ed 100644 --- a/source/Caves.cpp +++ b/source/Caves.cpp @@ -480,7 +480,7 @@ void cCaveTunnel::ProcessChunk( int DifX = itr->m_BlockX - BlockStartX; // substitution for faster calc int DifY = itr->m_BlockY; int DifZ = itr->m_BlockZ - BlockStartZ; // substitution for faster calc - int Bottom = std::max(itr->m_BlockY - itr->m_Radius, 0); + int Bottom = std::max(itr->m_BlockY - itr->m_Radius, 1); int Top = std::min(itr->m_BlockY + itr->m_Radius, cChunkDef::Height); int SqRad = itr->m_Radius * itr->m_Radius; for (int z = 0; z < cChunkDef::Width; z++) for (int x = 0; x < cChunkDef::Width; x++) @@ -881,14 +881,7 @@ void cStructGenMarbleCaves::GenStructures( const float WaveNoise = 1; if (cosf(GetMarbleNoise(xx, yy * 0.5f, zz, Noise)) * fabs(cosf(yy * 0.2f + WaveNoise * 2) * 0.75f + WaveNoise) > 0.0005f) { - if (y > 4) - { - cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_AIR); - } - else - { - cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_STATIONARY_LAVA); - } + cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_AIR); } } // for y } // for x @@ -938,14 +931,7 @@ void cStructGenDualRidgeCaves::GenStructures( float n4 = Noise2.CubicNoise3D(xx * 4, yy * 4, zz * 4) / 4; if ((abs(n1 + n3) * abs(n2 + n4)) > m_Threshold) { - if (y > 10) - { - cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_AIR); - } - else - { - cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_STATIONARY_LAVA); - } + cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_AIR); } } // for y } // for x -- cgit v1.2.3