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

Fix a few warnings

Browse Source
This commit is contained in:
Tycho 2014-06-16 15:03:07 +01:00
parent c0bc4a9d3a
commit 84c83e0deb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Blocks/BlockDoor.h
View File

@ -156,10 +156,10 @@ public:
if (a_BlockX > 0) if (a_BlockX > 0)
{ {
NIBBLETYPE DownMeta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY - 1, a_BlockZ); NIBBLETYPE DownMeta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY - 1, a_BlockZ);
return (DownMeta & 0x07) | 0x08 | (Meta << 4); return (NIBBLETYPE) ((DownMeta & 0x07) | 0x08 | (Meta << 4));
} }
// This is the top part of the door at the bottommost layer of the world, there's no bottom: // This is the top part of the door at the bottommost layer of the world, there's no bottom:
return 0x08 | (Meta << 4); return (NIBBLETYPE) (0x08 | (Meta << 4));
} }
else else
{ {
@ -167,7 +167,7 @@ public:
if (a_BlockY < cChunkDef::Height - 1) if (a_BlockY < cChunkDef::Height - 1)
{ {
NIBBLETYPE UpMeta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY + 1, a_BlockZ); NIBBLETYPE UpMeta = a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY + 1, a_BlockZ);
return Meta | (UpMeta << 4); return (NIBBLETYPE) (Meta | (UpMeta << 4));
} }
// This is the bottom part of the door at the topmost layer of the world, there's no top: // This is the bottom part of the door at the topmost layer of the world, there's no top:
return Meta; return Meta;