diff options
| author | Mattes D <github@xoft.cz> | 2016-07-29 07:57:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 07:57:30 +0200 |
| commit | 28da6ed640367e9d8cb1f6f11c9493faabb470d6 (patch) | |
| tree | 47bb2d183d541d5f9611260c12eb3f002a07d6f9 /src/Blocks | |
| parent | Merge pull request #3226 from cuberite/redstone (diff) | |
| parent | Revert "Redstone fixes" (diff) | |
| download | cuberite-28da6ed640367e9d8cb1f6f11c9493faabb470d6.tar cuberite-28da6ed640367e9d8cb1f6f11c9493faabb470d6.tar.gz cuberite-28da6ed640367e9d8cb1f6f11c9493faabb470d6.tar.bz2 cuberite-28da6ed640367e9d8cb1f6f11c9493faabb470d6.tar.lz cuberite-28da6ed640367e9d8cb1f6f11c9493faabb470d6.tar.xz cuberite-28da6ed640367e9d8cb1f6f11c9493faabb470d6.tar.zst cuberite-28da6ed640367e9d8cb1f6f11c9493faabb470d6.zip | |
Diffstat (limited to 'src/Blocks')
| -rw-r--r-- | src/Blocks/BlockComparator.h | 10 | ||||
| -rw-r--r-- | src/Blocks/BlockPiston.h | 6 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h index 5ba17c691..394b53a15 100644 --- a/src/Blocks/BlockComparator.h +++ b/src/Blocks/BlockComparator.h @@ -60,16 +60,6 @@ public: return true; } - inline static bool IsInSubtractionMode(NIBBLETYPE a_Meta) - { - return ((a_Meta & 0x4) == 0x4); - } - - inline static bool IsOn(NIBBLETYPE a_Meta) - { - return ((a_Meta & 0x8) == 0x8); - } - inline static Vector3i GetSideCoordinate(const Vector3i & a_Position, NIBBLETYPE a_Meta, bool a_bInverse) { auto Position = a_Position; diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h index 18b688256..30ccc168d 100644 --- a/src/Blocks/BlockPiston.h +++ b/src/Blocks/BlockPiston.h @@ -93,9 +93,6 @@ public: return 11; } - /** Returns true if the piston (with the specified meta) is extended */ - static inline bool IsExtended(NIBBLETYPE a_PistonMeta) { return ((a_PistonMeta & 0x8) != 0x0); } - private: typedef std::unordered_set<Vector3i, VectorHasher<int>> Vector3iSet; @@ -103,6 +100,9 @@ private: /** Returns true if the piston (specified by blocktype) is a sticky piston */ static inline bool IsSticky(BLOCKTYPE a_BlockType) { return (a_BlockType == E_BLOCK_STICKY_PISTON); } + /** Returns true if the piston (with the specified meta) is extended */ + static inline bool IsExtended(NIBBLETYPE a_PistonMeta) { return ((a_PistonMeta & 0x8) != 0x0); } + /** Returns true if the specified block can be pushed by a piston (and left intact) */ static inline bool CanPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) { |