summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/DeadlockDetect.cpp7
-rw-r--r--src/Generating/Caves.h4
-rw-r--r--src/Generating/DistortedHeightmap.cpp6
3 files changed, 8 insertions, 9 deletions
diff --git a/src/DeadlockDetect.cpp b/src/DeadlockDetect.cpp
index e699e0c84..c42d09b89 100644
--- a/src/DeadlockDetect.cpp
+++ b/src/DeadlockDetect.cpp
@@ -7,6 +7,7 @@
#include "DeadlockDetect.h"
#include "Root.h"
#include "World.h"
+# include <cstdlib>
@@ -137,11 +138,7 @@ void cDeadlockDetect::CheckWorldAge(const AString & a_WorldName, Int64 a_Age)
void cDeadlockDetect::DeadlockDetected(void)
{
ASSERT(!"Deadlock detected");
-
- // TODO: Make a crashdump / coredump
-
- // Crash the server intentionally:
- *((volatile int *)0) = 0;
+ abort();
}
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");
}