summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
authorTommy Santerre <tommy.santerre@gmail.com>2015-02-14 23:11:38 +0100
committerTommy Santerre <tommy.santerre@gmail.com>2015-03-20 01:32:17 +0100
commit3f6d823aa41f1a7641fb686cf24561b0aca95798 (patch)
treea695c90473a2de9ebd4fb91b9716b97d8ab929be /src/Generating
parentAPIDump: Added inheritance checking. (diff)
downloadcuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.gz
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.bz2
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.lz
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.xz
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.tar.zst
cuberite-3f6d823aa41f1a7641fb686cf24561b0aca95798.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/FinishGen.cpp2
-rw-r--r--src/Generating/ShapeGen.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index 260253d62..5839a4ccc 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -571,7 +571,7 @@ void cFinishGenSnow::GenFinish(cChunkDesc & a_ChunkDesc)
continue;
}
- if (!cBlockInfo::IsSnowable(a_ChunkDesc.GetBlockType(x, Height, z)) && (Height < cChunkDef::Height - 1))
+ if (!cBlockInfo::IsSnowable(a_ChunkDesc.GetBlockType(x, Height, z)) || (Height >= cChunkDef::Height - 1))
{
// The top block can't be snown over.
continue;
diff --git a/src/Generating/ShapeGen.cpp b/src/Generating/ShapeGen.cpp
index 45a9c3b93..43601ee20 100644
--- a/src/Generating/ShapeGen.cpp
+++ b/src/Generating/ShapeGen.cpp
@@ -41,7 +41,7 @@ public:
{
for (int x = 0; x < cChunkDef::Width; x++)
{
- HEIGHTTYPE height = cChunkDef::GetHeight(heightMap, x, z) + 1;
+ int height = cChunkDef::GetHeight(heightMap, x, z) + 1;
Byte * shapeColumn = &(a_Shape[(x + 16 * z) * 256]);
for (int y = 0; y < height; y++)
{