diff options
author | Mattes D <github@xoft.cz> | 2014-03-09 15:04:12 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-03-09 15:04:12 +0100 |
commit | 8a715db41f53dbf0ae838e7386d409fd8274e0ae (patch) | |
tree | 0ea2410e2775a93f1a97c2ff92a6c6deca9f55f1 /src/Generating | |
parent | Updated Core (diff) | |
parent | FIxed int in test (diff) | |
download | cuberite-8a715db41f53dbf0ae838e7386d409fd8274e0ae.tar cuberite-8a715db41f53dbf0ae838e7386d409fd8274e0ae.tar.gz cuberite-8a715db41f53dbf0ae838e7386d409fd8274e0ae.tar.bz2 cuberite-8a715db41f53dbf0ae838e7386d409fd8274e0ae.tar.lz cuberite-8a715db41f53dbf0ae838e7386d409fd8274e0ae.tar.xz cuberite-8a715db41f53dbf0ae838e7386d409fd8274e0ae.tar.zst cuberite-8a715db41f53dbf0ae838e7386d409fd8274e0ae.zip |
Diffstat (limited to 'src/Generating')
-rw-r--r-- | src/Generating/MineShafts.cpp | 2 | ||||
-rw-r--r-- | src/Generating/Trees.cpp | 2 |
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--; } |