master
Tycho 2014-03-07 11:15:04 -08:00
parent d33d72f0dc
commit 21e85b0745
2 changed files with 3 additions and 1 deletions

View File

@ -70,6 +70,8 @@ public:
{
}
virtual ~cMineShaft() {}
/// Returns true if this mineshaft intersects the specified cuboid
bool DoesIntersect(const cCuboid & a_Other)
{

View File

@ -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--;
}