flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Revert "Fixed some warnings"

Browse Source 
This reverts commit 4cb0b82d1d.
This commit is contained in:
madmaxoft 2014-03-10 20:52:53 +01:00
parent 411c4ddd79
commit 4ed68916d8
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ChunkDef.h
View File

@ -65,8 +65,8 @@ public:
enum enum
{ {
// Chunk dimensions: // Chunk dimensions:
Width = 16U, Width = 16,
Height = 256U, Height = 256,
NumBlocks = Width * Height * Width, NumBlocks = Width * Height * Width,
/// If the data is collected into a single buffer, how large it needs to be: /// 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 #if AXIS_ORDER == AXIS_ORDER_XZY
// For some reason, NOT using the Horner schema is faster. Weird. // 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)) 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; return (a_Buffer[Index / 2] >> ((Index & 1) * 4)) & 0x0f;
} }
ASSERT(!"cChunkDef::GetNibble(): coords out of chunk range!"); ASSERT(!"cChunkDef::GetNibble(): coords out of chunk range!");
@ -256,7 +256,7 @@ public:
return; return;
} }
a_Buffer[a_BlockIdx / 2] = ( 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 ((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 ); 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 ); 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 class cChunkDataCallback abstract
{ {
public: public:
virtual ~cChunkDataCallback() {}
/** Called before any other callbacks to inform of the current coords /** Called before any other callbacks to inform of the current coords
(only in processes where multiple chunks can be processed, such as cWorld::ForEachChunkInRect()). (only in processes where multiple chunks can be processed, such as cWorld::ForEachChunkInRect()).
If false is returned, the chunk is skipped. If false is returned, the chunk is skipped.