summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-03-10 20:52:53 +0100
committermadmaxoft <github@xoft.cz>2014-03-10 20:52:53 +0100
commit4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9 (patch)
tree9142782fe0287fe4a9077dc2b7e470b060006cf0
parentMerge pull request #779 from mc-server/tntburnexplode (diff)
downloadcuberite-4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9.tar
cuberite-4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9.tar.gz
cuberite-4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9.tar.bz2
cuberite-4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9.tar.lz
cuberite-4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9.tar.xz
cuberite-4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9.tar.zst
cuberite-4ed68916d8c0ac4b5384bbaf83088b52ca2d47d9.zip
-rw-r--r--src/ChunkDef.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/ChunkDef.h b/src/ChunkDef.h
index 63431f211..7be2fa2df 100644
--- a/src/ChunkDef.h
+++ b/src/ChunkDef.h
@@ -65,8 +65,8 @@ public:
enum
{
// Chunk dimensions:
- Width = 16U,
- Height = 256U,
+ Width = 16,
+ Height = 256,
NumBlocks = Width * Height * Width,
/// If the data is collected into a single buffer, how large it needs to be:
@@ -132,7 +132,7 @@ public:
}
- inline static unsigned int MakeIndexNoCheck(unsigned int x, unsigned int y, unsigned int z)
+ inline static unsigned int MakeIndexNoCheck(int x, int y, int z)
{
#if AXIS_ORDER == AXIS_ORDER_XZY
// For some reason, NOT using the Horner schema is faster. Weird.
@@ -240,7 +240,7 @@ public:
{
if ((x < Width) && (x > -1) && (y < Height) && (y > -1) && (z < Width) && (z > -1))
{
- unsigned int Index = MakeIndexNoCheck(x, y, z);
+ int Index = MakeIndexNoCheck(x, y, z);
return (a_Buffer[Index / 2] >> ((Index & 1) * 4)) & 0x0f;
}
ASSERT(!"cChunkDef::GetNibble(): coords out of chunk range!");
@@ -256,7 +256,7 @@ public:
return;
}
a_Buffer[a_BlockIdx / 2] = (
- (a_Buffer[a_BlockIdx / 2] & (0xf0 >> (static_cast<NIBBLETYPE>(a_BlockIdx & 1) * 4))) | // The untouched nibble
+ (a_Buffer[a_BlockIdx / 2] & (0xf0 >> ((a_BlockIdx & 1) * 4))) | // The untouched nibble
((a_Nibble & 0x0f) << ((a_BlockIdx & 1) * 4)) // The nibble being set
);
}
@@ -282,13 +282,13 @@ public:
}
- inline static NIBBLETYPE GetNibble(const NIBBLETYPE * a_Buffer, const Vector3i & a_BlockPos )
+ inline static char GetNibble(const NIBBLETYPE * a_Buffer, const Vector3i & a_BlockPos )
{
return GetNibble(a_Buffer, a_BlockPos.x, a_BlockPos.y, a_BlockPos.z );
}
- inline static void SetNibble(NIBBLETYPE * a_Buffer, const Vector3i & a_BlockPos, NIBBLETYPE a_Value )
+ inline static void SetNibble(NIBBLETYPE * a_Buffer, const Vector3i & a_BlockPos, char a_Value )
{
SetNibble( a_Buffer, a_BlockPos.x, a_BlockPos.y, a_BlockPos.z, a_Value );
}
@@ -306,9 +306,6 @@ The virtual methods are called in the same order as they're declared here.
class cChunkDataCallback abstract
{
public:
-
- virtual ~cChunkDataCallback() {}
-
/** Called before any other callbacks to inform of the current coords
(only in processes where multiple chunks can be processed, such as cWorld::ForEachChunkInRect()).
If false is returned, the chunk is skipped.