From adf5edc913c777c85684a6d5d16abfd03eb81382 Mon Sep 17 00:00:00 2001 From: Alexandre Guertin Date: Mon, 9 Mar 2015 18:13:55 -0400 Subject: Buttons can be placed on the top and on the bottom face of a block --- src/Blocks/BlockButton.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index 8e4f04740..682fb52e9 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -61,14 +61,16 @@ public: { switch (a_BlockFace) { + case BLOCK_FACE_YP: return 0x6; case BLOCK_FACE_ZM: return 0x4; case BLOCK_FACE_ZP: return 0x3; case BLOCK_FACE_XM: return 0x2; case BLOCK_FACE_XP: return 0x1; + case BLOCK_FACE_YM: return 0x0; default: { ASSERT(!"Unhandled block face!"); - return 0x0; // No idea, give a special meta (button in centre of block) + return 0x0; } } } @@ -81,6 +83,10 @@ public: case 0x2: return BLOCK_FACE_XM; case 0x3: return BLOCK_FACE_ZP; case 0x4: return BLOCK_FACE_ZM; + case 0x5: + case 0x6: return BLOCK_FACE_YP; + case 0x7: + case 0x0: return BLOCK_FACE_YM; default: { ASSERT(!"Unhandled block meta!"); -- cgit v1.2.3 From 97daf810ff6bf1e1b5024cbb9644e246e72d3d76 Mon Sep 17 00:00:00 2001 From: Alexandre Guertin Date: Wed, 25 Mar 2015 16:12:02 -0400 Subject: Removed 0x6, 0x7 from BlockButton. --- src/Blocks/BlockButton.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index 682fb52e9..d24c7d952 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -61,7 +61,7 @@ public: { switch (a_BlockFace) { - case BLOCK_FACE_YP: return 0x6; + case BLOCK_FACE_YP: return 0x5; case BLOCK_FACE_ZM: return 0x4; case BLOCK_FACE_ZP: return 0x3; case BLOCK_FACE_XM: return 0x2; @@ -79,14 +79,12 @@ public: { switch (a_Meta & 0x7) { + case 0x0: return BLOCK_FACE_YM; case 0x1: return BLOCK_FACE_XP; case 0x2: return BLOCK_FACE_XM; case 0x3: return BLOCK_FACE_ZP; case 0x4: return BLOCK_FACE_ZM; - case 0x5: - case 0x6: return BLOCK_FACE_YP; - case 0x7: - case 0x0: return BLOCK_FACE_YM; + case 0x5: return BLOCK_FACE_YP; default: { ASSERT(!"Unhandled block meta!"); -- cgit v1.2.3