diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-06-30 16:50:15 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-07-14 22:46:30 +0200 |
| commit | 8656e149c8820272a882406912790f0075ed5f28 (patch) | |
| tree | b4f89f69dfb026f76862046637fd99162a49d3c9 /src/Blocks/BlockButton.h | |
| parent | Merge pull request #2352 from mmdk95/master (diff) | |
| download | cuberite-8656e149c8820272a882406912790f0075ed5f28.tar cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.gz cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.bz2 cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.lz cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.xz cuberite-8656e149c8820272a882406912790f0075ed5f28.tar.zst cuberite-8656e149c8820272a882406912790f0075ed5f28.zip | |
Diffstat (limited to 'src/Blocks/BlockButton.h')
| -rw-r--r-- | src/Blocks/BlockButton.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index 3558729bb..c24945ea8 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -15,7 +15,6 @@ public: : cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>(a_BlockType) { } - virtual void OnUse(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override { @@ -49,7 +48,6 @@ public: }); } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { @@ -57,13 +55,11 @@ public: a_Pickups.push_back(cItem(m_BlockType, 1, 0)); } - virtual bool IsUseable(void) override { return true; } - virtual bool GetPlacementBlockTypeMeta( cChunkInterface & a_ChunkInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, @@ -76,7 +72,6 @@ public: return true; } - inline static NIBBLETYPE BlockFaceToMetaData(eBlockFace a_BlockFace) { switch (a_BlockFace) @@ -99,7 +94,6 @@ public: #endif } - inline static eBlockFace BlockMetaDataToBlockFace(NIBBLETYPE a_Meta) { switch (a_Meta & 0x7) @@ -118,7 +112,6 @@ public: } } - virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override { NIBBLETYPE Meta; @@ -129,6 +122,12 @@ public: return (a_RelY > 0) && (cBlockInfo::FullyOccupiesVoxel(BlockIsOn)); } + + virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override + { + UNUSED(a_Meta); + return 0; + } } ; |