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

Hopefully fixed repeated clang warnings.

Browse Source
This commit is contained in:
madmaxoft 2014-04-28 22:22:07 +02:00
parent dffd38e53b
commit 55a7f392cc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ChunkDef.h
View File

@ -246,8 +246,8 @@ 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))
{ {
int Index = MakeIndexNoCheck(x, y, z); size_t Index = (size_t)MakeIndexNoCheck(x, y, z);
if ((size_t)(Index / 2) >= a_Buffer.size()) if ((Index / 2) >= a_Buffer.size())
{ {
return (a_IsSkyLightNibble ? 0xff : 0); return (a_IsSkyLightNibble ? 0xff : 0);
} }
@ -281,7 +281,7 @@ public:
{ {
a_Buffer.resize((size_t)((a_BlockIdx / 2) + 1)); a_Buffer.resize((size_t)((a_BlockIdx / 2) + 1));
} }
a_Buffer[(size_t)(a_BlockIdx / 2)] = PackNibble(a_Buffer, a_BlockIdx, a_Nibble); a_Buffer[(size_t)(a_BlockIdx / 2)] = PackNibble(a_Buffer, (size_t)a_BlockIdx, a_Nibble);
} }
@ -297,19 +297,19 @@ public:
return; return;
} }
int Index = MakeIndexNoCheck(x, y, z); size_t Index = (size_t)MakeIndexNoCheck(x, y, z);
if ((size_t)(Index / 2) >= a_Buffer.size()) if ((Index / 2) >= a_Buffer.size())
{ {
a_Buffer.resize((size_t)((Index / 2) + 1)); a_Buffer.resize(((Index / 2) + 1));
} }
a_Buffer[(size_t)(Index / 2)] = PackNibble(a_Buffer, Index, a_Nibble); a_Buffer[(Index / 2)] = PackNibble(a_Buffer, Index, a_Nibble);
} }
private: private:
inline static NIBBLETYPE PackNibble(const COMPRESSED_NIBBLETYPE & a_Buffer, int a_Index, NIBBLETYPE a_Nibble) inline static NIBBLETYPE PackNibble(const COMPRESSED_NIBBLETYPE & a_Buffer, size_t a_Index, NIBBLETYPE a_Nibble)
{ {
return static_cast<NIBBLETYPE>( return static_cast<NIBBLETYPE>(
(a_Buffer[a_Index / 2] & (0xf0 >> ((a_Index & 1) * 4))) | // The untouched nibble (a_Buffer[a_Index / 2] & (0xf0 >> ((a_Index & 1) * 4))) | // The untouched nibble
@ -318,7 +318,7 @@ private:
} }
inline static NIBBLETYPE ExpandNibble(const COMPRESSED_NIBBLETYPE & a_Buffer, int a_Index) inline static NIBBLETYPE ExpandNibble(const COMPRESSED_NIBBLETYPE & a_Buffer, size_t a_Index)
{ {
return (a_Buffer[a_Index / 2] >> ((a_Index & 1) * 4)) & 0x0f; return (a_Buffer[a_Index / 2] >> ((a_Index & 1) * 4)) & 0x0f;
} }