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

FinishGen: Fixed sand collapsing and fluid stationarizing

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1246 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-03-03 15:02:50 +00:00
parent 185ebc4168
commit a2925ee6c8
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/Generating/FinishGen.cpp
View File

@ -429,6 +429,7 @@ void cFinishGenPreSimulator::CollapseSandGravel(
for (int x = 0; x < cChunkDef::Width; x++) for (int x = 0; x < cChunkDef::Width; x++)
{ {
int LastY = -1; int LastY = -1;
int HeightY = 0;
for (int y = 0; y < cChunkDef::Height; y++) for (int y = 0; y < cChunkDef::Height; y++)
{ {
BLOCKTYPE Block = cChunkDef::GetBlock(a_BlockTypes, x, y, z); BLOCKTYPE Block = cChunkDef::GetBlock(a_BlockTypes, x, y, z);
@ -438,16 +439,22 @@ void cFinishGenPreSimulator::CollapseSandGravel(
{ {
// Set the last block onto which stuff can fall to this height: // Set the last block onto which stuff can fall to this height:
LastY = y; LastY = y;
HeightY = y;
break; break;
} }
case E_BLOCK_AIR: case E_BLOCK_AIR:
{
// Do nothing
break;
}
case E_BLOCK_FIRE: case E_BLOCK_FIRE:
case E_BLOCK_WATER: case E_BLOCK_WATER:
case E_BLOCK_STATIONARY_WATER: case E_BLOCK_STATIONARY_WATER:
case E_BLOCK_LAVA: case E_BLOCK_LAVA:
case E_BLOCK_STATIONARY_LAVA: case E_BLOCK_STATIONARY_LAVA:
{ {
// Do nothing // Do nothing, only remember this height as potentially highest
HeightY = y;
break; break;
} }
case E_BLOCK_SAND: case E_BLOCK_SAND:
@ -459,11 +466,15 @@ void cFinishGenPreSimulator::CollapseSandGravel(
cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_AIR); cChunkDef::SetBlock(a_BlockTypes, x, y, z, E_BLOCK_AIR);
} }
LastY++; LastY++;
if (LastY > HeightY)
{
HeightY = LastY;
}
break; break;
} }
} // switch (GetBlock) } // switch (GetBlock)
} // for y } // for y
cChunkDef::SetHeight(a_HeightMap, x, z, LastY); cChunkDef::SetHeight(a_HeightMap, x, z, HeightY);
} // for x } // for x
} // for z } // for z
} }
@ -525,7 +536,7 @@ void cFinishGenPreSimulator::StationarizeFluid(
// Turn fluid at the chunk edges into non-stationary fluid: // Turn fluid at the chunk edges into non-stationary fluid:
for (int y = 0; y < cChunkDef::Height; y++) for (int y = 0; y < cChunkDef::Height; y++)
{ {
for (int i = 1; i < cChunkDef::Width; i++) // i stands for both x and z here for (int i = 0; i < cChunkDef::Width; i++) // i stands for both x and z here
{ {
if (cChunkDef::GetBlock(a_BlockTypes, 0, y, i) == a_StationaryFluid) if (cChunkDef::GetBlock(a_BlockTypes, 0, y, i) == a_StationaryFluid)
{ {