diff options
| author | Mattes D <github@xoft.cz> | 2013-12-10 21:55:57 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2013-12-10 21:55:57 +0100 |
| commit | 60ca21b59877b5402c6fb6cc108283cbd4f986fd (patch) | |
| tree | b7fd3d91bd4376d537e49f7a18023ff8fabfc449 /src/Generating | |
| parent | Merge pull request #412 from mc-server/fixes (diff) | |
| parent | added abort to DeadlockDetector to generate core dumps on failure (diff) | |
| download | cuberite-60ca21b59877b5402c6fb6cc108283cbd4f986fd.tar cuberite-60ca21b59877b5402c6fb6cc108283cbd4f986fd.tar.gz cuberite-60ca21b59877b5402c6fb6cc108283cbd4f986fd.tar.bz2 cuberite-60ca21b59877b5402c6fb6cc108283cbd4f986fd.tar.lz cuberite-60ca21b59877b5402c6fb6cc108283cbd4f986fd.tar.xz cuberite-60ca21b59877b5402c6fb6cc108283cbd4f986fd.tar.zst cuberite-60ca21b59877b5402c6fb6cc108283cbd4f986fd.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Generating/Caves.h | 4 | ||||
| -rw-r--r-- | src/Generating/DistortedHeightmap.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Generating/Caves.h b/src/Generating/Caves.h index 70cf6fe8c..ea7f10bf4 100644 --- a/src/Generating/Caves.h +++ b/src/Generating/Caves.h @@ -70,8 +70,8 @@ public: cStructGenWormNestCaves(int a_Seed, int a_Size = 64, int a_Grid = 96, int a_MaxOffset = 128) : m_Noise(a_Seed), m_Size(a_Size), - m_Grid(a_Grid), - m_MaxOffset(a_MaxOffset) + m_MaxOffset(a_MaxOffset), + m_Grid(a_Grid) { } diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp index a61d79bec..c32a3bf43 100644 --- a/src/Generating/DistortedHeightmap.cpp +++ b/src/Generating/DistortedHeightmap.cpp @@ -737,9 +737,11 @@ void cDistortedHeightmap::ComposeColumn(cChunkDesc & a_ChunkDesc, int a_RelX, in FillColumnMesa(a_ChunkDesc, a_RelX, a_RelZ); return; } - + default: + ASSERT(!"Unhandled biome"); + return; } // switch (Biome) - ASSERT(!"Unhandled biome"); + ASSERT(!"Unexpected fallthrough"); } |