summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-07 20:15:04 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-07 20:15:04 +0100
commit21e85b07456f12c029ab32c396285ad13063964f (patch)
treee0a39a85a44dadcb4276e0e8e1c4d0d2abdb9811
parentWarnings (diff)
downloadcuberite-21e85b07456f12c029ab32c396285ad13063964f.tar
cuberite-21e85b07456f12c029ab32c396285ad13063964f.tar.gz
cuberite-21e85b07456f12c029ab32c396285ad13063964f.tar.bz2
cuberite-21e85b07456f12c029ab32c396285ad13063964f.tar.lz
cuberite-21e85b07456f12c029ab32c396285ad13063964f.tar.xz
cuberite-21e85b07456f12c029ab32c396285ad13063964f.tar.zst
cuberite-21e85b07456f12c029ab32c396285ad13063964f.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/MineShafts.cpp2
-rw-r--r--src/Generating/Trees.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Generating/MineShafts.cpp b/src/Generating/MineShafts.cpp
index d9acc57bb..28dc37567 100644
--- a/src/Generating/MineShafts.cpp
+++ b/src/Generating/MineShafts.cpp
@@ -69,6 +69,8 @@ public:
m_BoundingBox(a_BoundingBox)
{
}
+
+ virtual ~cMineShaft() {}
/// Returns true if this mineshaft intersects the specified cuboid
bool DoesIntersect(const cCuboid & a_Other)
diff --git a/src/Generating/Trees.cpp b/src/Generating/Trees.cpp
index a660285d1..4909587b1 100644
--- a/src/Generating/Trees.cpp
+++ b/src/Generating/Trees.cpp
@@ -595,7 +595,7 @@ void GetPineTreeImage(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_Noise
{
break;
}
- ASSERT(LayerSize < ARRAYCOUNT(BigOs));
+ ASSERT((size_t)LayerSize < ARRAYCOUNT(BigOs));
PushCoordBlocks(a_BlockX, h, a_BlockZ, a_OtherBlocks, BigOs[LayerSize].Coords, BigOs[LayerSize].Count, E_BLOCK_LEAVES, E_META_LEAVES_CONIFER);
h--;
}