summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Generating/Caves.h4
-rw-r--r--src/Generating/DistortedHeightmap.cpp6
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");
}