flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #520 from mc-server/SoulSand

Browse Source 
NetherGen: Now generates SoulSand.
This commit is contained in:
Mattes D 2014-01-10 07:14:19 -08:00
commit 6943a4df74
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Generating/Caves.cpp
View File

@ -509,6 +509,7 @@ void cCaveTunnel::ProcessChunk(
case E_BLOCK_GRAVEL: case E_BLOCK_GRAVEL:
case E_BLOCK_SAND: case E_BLOCK_SAND:
case E_BLOCK_SANDSTONE: case E_BLOCK_SANDSTONE:
case E_BLOCK_SOULSAND:
case E_BLOCK_NETHERRACK: case E_BLOCK_NETHERRACK:
case E_BLOCK_COAL_ORE: case E_BLOCK_COAL_ORE:
case E_BLOCK_IRON_ORE: case E_BLOCK_IRON_ORE:

17
src/Generating/CompoGen.cpp
View File

@ -589,7 +589,22 @@ void cCompoGenNether::ComposeTerrain(cChunkDesc & a_ChunkDesc)
for (int y = 0; y < SEGMENT_HEIGHT; y++) for (int y = 0; y < SEGMENT_HEIGHT; y++)
{ {
int Val = Lo + (Hi - Lo) * y / SEGMENT_HEIGHT; int Val = Lo + (Hi - Lo) * y / SEGMENT_HEIGHT;
a_ChunkDesc.SetBlockType(x, y + Segment, z, (Val < m_Threshold) ? E_BLOCK_NETHERRACK : E_BLOCK_AIR); BLOCKTYPE Block = E_BLOCK_AIR;
if (Val < m_Threshold) // Don't calculate if the block should be Netherrack or Soulsand when it's already decided that it's air.
{
NOISE_DATATYPE NoiseX = ((NOISE_DATATYPE)(BaseX + x)) / 8;
NOISE_DATATYPE NoiseY = ((NOISE_DATATYPE)(BaseZ + z)) / 8;
NOISE_DATATYPE CompBlock = m_Noise1.CubicNoise3D(NoiseX, (float) (y + Segment) / 2, NoiseY);
if (CompBlock < -0.5)
{
Block = E_BLOCK_SOULSAND;
}
else
{
Block = E_BLOCK_NETHERRACK;
}
}
a_ChunkDesc.SetBlockType(x, y + Segment, z, Block);
} }
} }