diff options
Diffstat (limited to 'src/Blocks/BlockStairs.h')
| -rw-r--r-- | src/Blocks/BlockStairs.h | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/src/Blocks/BlockStairs.h b/src/Blocks/BlockStairs.h index 76614bb62..6482d005f 100644 --- a/src/Blocks/BlockStairs.h +++ b/src/Blocks/BlockStairs.h @@ -7,13 +7,12 @@ -class cBlockStairsHandler final : - public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>> +class cBlockStairsHandler final + : public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>> { using Super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>>; -public: - + public: using Super::Super; static bool IsAnyStairType(BLOCKTYPE a_Block) @@ -33,8 +32,7 @@ public: case E_BLOCK_DARK_OAK_WOOD_STAIRS: case E_BLOCK_BRICK_STAIRS: case E_BLOCK_NETHER_BRICK_STAIRS: - case E_BLOCK_SPRUCE_WOOD_STAIRS: - return true; + case E_BLOCK_SPRUCE_WOOD_STAIRS: return true; default: { return false; @@ -42,8 +40,7 @@ public: } } -private: - + private: virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) const override { // Toggle bit 3: @@ -57,19 +54,19 @@ private: switch (m_BlockType) { case E_BLOCK_SANDSTONE_STAIRS: - case E_BLOCK_BIRCH_WOOD_STAIRS: return 2; - case E_BLOCK_QUARTZ_STAIRS: return 8; + case E_BLOCK_BIRCH_WOOD_STAIRS: return 2; + case E_BLOCK_QUARTZ_STAIRS: return 8; case E_BLOCK_JUNGLE_WOOD_STAIRS: case E_BLOCK_RED_SANDSTONE_STAIRS: return 10; case E_BLOCK_COBBLESTONE_STAIRS: - case E_BLOCK_STONE_BRICK_STAIRS: return 11; - case E_BLOCK_OAK_WOOD_STAIRS: return 13; - case E_BLOCK_ACACIA_WOOD_STAIRS: return 15; - case E_BLOCK_PURPUR_STAIRS: return 16; + case E_BLOCK_STONE_BRICK_STAIRS: return 11; + case E_BLOCK_OAK_WOOD_STAIRS: return 13; + case E_BLOCK_ACACIA_WOOD_STAIRS: return 15; + case E_BLOCK_PURPUR_STAIRS: return 16; case E_BLOCK_DARK_OAK_WOOD_STAIRS: return 26; - case E_BLOCK_BRICK_STAIRS: return 28; - case E_BLOCK_NETHER_BRICK_STAIRS: return 35; - case E_BLOCK_SPRUCE_WOOD_STAIRS: return 34; + case E_BLOCK_BRICK_STAIRS: return 28; + case E_BLOCK_NETHER_BRICK_STAIRS: return 35; + case E_BLOCK_SPRUCE_WOOD_STAIRS: return 34; default: { ASSERT(!"Unhandled blocktype in stairs handler!"); @@ -82,11 +79,11 @@ private: - /** EXCEPTION a.k.a. why is this removed: - This collision-detection is actually more accurate than the client, but since the client itself - sends inaccurate / sparse data, it's easier to just err on the side of the client and keep the - two in sync by assuming that if a player hit ANY of the stair's bounding cube, it counts as the ground. */ - #if 0 +/** EXCEPTION a.k.a. why is this removed: +This collision-detection is actually more accurate than the client, but since the client itself +sends inaccurate / sparse data, it's easier to just err on the side of the client and keep the +two in sync by assuming that if a player hit ANY of the stair's bounding cube, it counts as the ground. */ +#if 0 bool IsInsideBlock(Vector3d a_RelPosition, const BLOCKTYPE a_BlockType, const NIBBLETYPE a_BlockMeta) { if (a_BlockMeta & 0x4) // upside down @@ -111,10 +108,5 @@ private: } return false; } - #endif - -} ; - - - - +#endif +}; |