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

Merge pull request #1799 from SnappingTurtles/BlockButton

Browse Source 
Buttons can be placed on the top and on the bottom face of a block
This commit is contained in:
Mattes D 2015-04-03 15:41:39 +02:00
commit afdd751fe3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Blocks/BlockButton.h
View File

@ -61,14 +61,16 @@ public:
{ {
switch (a_BlockFace) switch (a_BlockFace)
{ {
case BLOCK_FACE_YP: return 0x5;
case BLOCK_FACE_ZM: return 0x4; case BLOCK_FACE_ZM: return 0x4;
case BLOCK_FACE_ZP: return 0x3; case BLOCK_FACE_ZP: return 0x3;
case BLOCK_FACE_XM: return 0x2; case BLOCK_FACE_XM: return 0x2;
case BLOCK_FACE_XP: return 0x1; case BLOCK_FACE_XP: return 0x1;
case BLOCK_FACE_YM: return 0x0;
default: default:
{ {
ASSERT(!"Unhandled block face!"); ASSERT(!"Unhandled block face!");
return 0x0; // No idea, give a special meta (button in centre of block) return 0x0;
} }
} }
} }
@ -77,10 +79,12 @@ public:
{ {
switch (a_Meta & 0x7) switch (a_Meta & 0x7)
{ {
case 0x0: return BLOCK_FACE_YM;
case 0x1: return BLOCK_FACE_XP; case 0x1: return BLOCK_FACE_XP;
case 0x2: return BLOCK_FACE_XM; case 0x2: return BLOCK_FACE_XM;
case 0x3: return BLOCK_FACE_ZP; case 0x3: return BLOCK_FACE_ZP;
case 0x4: return BLOCK_FACE_ZM; case 0x4: return BLOCK_FACE_ZM;
case 0x5: return BLOCK_FACE_YP;
default: default:
{ {
ASSERT(!"Unhandled block meta!"); ASSERT(!"Unhandled block meta!");