summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockSideways.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-14 22:57:44 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-14 22:57:44 +0200
commit5b1552435f95887ba59c707e3635dcaf9cb358f4 (patch)
treef804248a5eb61c2b5a947dc574d1221f7b31b987 /src/Blocks/BlockSideways.h
parentMaybe improved arrow sinking (diff)
downloadcuberite-5b1552435f95887ba59c707e3635dcaf9cb358f4.tar
cuberite-5b1552435f95887ba59c707e3635dcaf9cb358f4.tar.gz
cuberite-5b1552435f95887ba59c707e3635dcaf9cb358f4.tar.bz2
cuberite-5b1552435f95887ba59c707e3635dcaf9cb358f4.tar.lz
cuberite-5b1552435f95887ba59c707e3635dcaf9cb358f4.tar.xz
cuberite-5b1552435f95887ba59c707e3635dcaf9cb358f4.tar.zst
cuberite-5b1552435f95887ba59c707e3635dcaf9cb358f4.zip
Diffstat (limited to 'src/Blocks/BlockSideways.h')
-rw-r--r--src/Blocks/BlockSideways.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Blocks/BlockSideways.h b/src/Blocks/BlockSideways.h
index d67c3aa24..5b37efd75 100644
--- a/src/Blocks/BlockSideways.h
+++ b/src/Blocks/BlockSideways.h
@@ -32,36 +32,36 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3);
+ a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3); // Reset meta
}
- inline static NIBBLETYPE BlockFaceToMetaData(eBlockFace a_BlockFace, NIBBLETYPE a_WoodMeta)
+ inline static NIBBLETYPE BlockFaceToMetaData(eBlockFace a_BlockFace, NIBBLETYPE a_Meta)
{
switch (a_BlockFace)
{
case BLOCK_FACE_YM:
case BLOCK_FACE_YP:
{
- return a_WoodMeta; // Top or bottom, just return original
+ return a_Meta; // Top or bottom, just return original
}
case BLOCK_FACE_ZP:
case BLOCK_FACE_ZM:
{
- return a_WoodMeta | 0x8; // North or south
+ return a_Meta | 0x8; // North or south
}
case BLOCK_FACE_XP:
case BLOCK_FACE_XM:
{
- return a_WoodMeta | 0x4; // East or west
+ return a_Meta | 0x4; // East or west
}
default:
{
ASSERT(!"Unhandled block face!");
- return a_WoodMeta | 0xC; // No idea, give a special meta (all sides bark)
+ return a_Meta | 0xC; // No idea, give a special meta
}
}
}