diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-07-18 02:19:30 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-07-18 02:19:30 +0200 |
commit | eeacb6f2223f88a64ce877458c58fa60194e45a6 (patch) | |
tree | ed9473ee963f5d3482f9684e1a7483c6f32c7193 /src/Blocks/BlockSignPost.h | |
parent | Fixed NULL being passed instead of a double to AddEntityEffect (diff) | |
download | cuberite-eeacb6f2223f88a64ce877458c58fa60194e45a6.tar cuberite-eeacb6f2223f88a64ce877458c58fa60194e45a6.tar.gz cuberite-eeacb6f2223f88a64ce877458c58fa60194e45a6.tar.bz2 cuberite-eeacb6f2223f88a64ce877458c58fa60194e45a6.tar.lz cuberite-eeacb6f2223f88a64ce877458c58fa60194e45a6.tar.xz cuberite-eeacb6f2223f88a64ce877458c58fa60194e45a6.tar.zst cuberite-eeacb6f2223f88a64ce877458c58fa60194e45a6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Blocks/BlockSignPost.h (renamed from src/Blocks/BlockSign.h) | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/Blocks/BlockSign.h b/src/Blocks/BlockSignPost.h index 5aa8ade3d..d5b0c0b5f 100644 --- a/src/Blocks/BlockSign.h +++ b/src/Blocks/BlockSignPost.h @@ -9,21 +9,21 @@ -class cBlockSignHandler : +class cBlockSignPostHandler : public cBlockHandler { public: - cBlockSignHandler(BLOCKTYPE a_BlockType) + cBlockSignPostHandler(BLOCKTYPE a_BlockType) : cBlockHandler(a_BlockType) { } - + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { a_Pickups.push_back(cItem(E_ITEM_SIGN, 1, 0)); } - + virtual const char * GetStepSound(void) override { @@ -31,6 +31,17 @@ public: } + virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override + { + if (a_RelY <= 0) + { + return false; + } + + return (cBlockInfo::IsSolid(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ))); + } + + static NIBBLETYPE RotationToMetaData(double a_Rotation) { a_Rotation += 180 + (180 / 16); // So it's not aligned with axis @@ -43,23 +54,6 @@ public: return ((char)a_Rotation) % 16; } - - - static NIBBLETYPE DirectionToMetaData(eBlockFace a_Direction) - { - switch (a_Direction) - { - case 0x2: return 0x2; - case 0x3: return 0x3; - case 0x4: return 0x4; - case 0x5: return 0x5; - default: - { - break; - } - } - return 0x2; - } virtual void OnPlacedByPlayer( |