diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2016-07-29 00:39:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 00:39:13 +0200 |
| commit | 47831ee933a5fb80808be9e98523d635f4dbc548 (patch) | |
| tree | ea3f89419865fd4383865c39480ece19b793a4f6 /src/Blocks | |
| parent | Tab completion across worlds (#3270) (diff) | |
| parent | Consolidated comparator code (diff) | |
| download | cuberite-47831ee933a5fb80808be9e98523d635f4dbc548.tar cuberite-47831ee933a5fb80808be9e98523d635f4dbc548.tar.gz cuberite-47831ee933a5fb80808be9e98523d635f4dbc548.tar.bz2 cuberite-47831ee933a5fb80808be9e98523d635f4dbc548.tar.lz cuberite-47831ee933a5fb80808be9e98523d635f4dbc548.tar.xz cuberite-47831ee933a5fb80808be9e98523d635f4dbc548.tar.zst cuberite-47831ee933a5fb80808be9e98523d635f4dbc548.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, 13 insertions, 3 deletions
diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h index 394b53a15..5ba17c691 100644 --- a/src/Blocks/BlockComparator.h +++ b/src/Blocks/BlockComparator.h @@ -60,6 +60,16 @@ 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 30ccc168d..18b688256 100644 --- a/src/Blocks/BlockPiston.h +++ b/src/Blocks/BlockPiston.h @@ -93,6 +93,9 @@ 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; @@ -100,9 +103,6 @@ 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) { |