diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-07-26 23:24:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-26 23:24:36 +0200 |
commit | 950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3 (patch) | |
tree | 5e6fde4625714922e970bd5ad4ea339f58ab6b57 /src/Blocks | |
parent | At long last... Piston animations! (diff) | |
download | cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.gz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.bz2 cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.lz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.xz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.zst cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.zip |
Diffstat (limited to 'src/Blocks')
-rw-r--r-- | src/Blocks/BlockDoor.cpp | 4 | ||||
-rw-r--r-- | src/Blocks/BlockHandler.cpp | 2 | ||||
-rw-r--r-- | src/Blocks/ChunkInterface.cpp | 7 | ||||
-rw-r--r-- | src/Blocks/GetHandlerCompileTimeTemplate.h | 8 |
4 files changed, 5 insertions, 16 deletions
diff --git a/src/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp index 77b18a508..a0c112723 100644 --- a/src/Blocks/BlockDoor.cpp +++ b/src/Blocks/BlockDoor.cpp @@ -149,6 +149,8 @@ NIBBLETYPE cBlockDoorHandler::MetaRotateCW(NIBBLETYPE a_Meta) + + NIBBLETYPE cBlockDoorHandler::MetaMirrorXY(NIBBLETYPE a_Meta) { /* @@ -181,6 +183,8 @@ NIBBLETYPE cBlockDoorHandler::MetaMirrorXY(NIBBLETYPE a_Meta) + + NIBBLETYPE cBlockDoorHandler::MetaMirrorYZ(NIBBLETYPE a_Meta) { // Top bit (0x08) contains door panel type (Top / Bottom panel) Only Bottom panels contain position data diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index fb097c395..e4cf182d2 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -91,7 +91,6 @@ - /* // Tests the meta rotation and mirroring. // Note that the cMetaRotator needs to have its assert paths disabled for this test to work! @@ -577,6 +576,7 @@ void cBlockHandler::DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterfac + bool cBlockHandler::CanBeAt(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ, const cChunk & a_Chunk) { return true; diff --git a/src/Blocks/ChunkInterface.cpp b/src/Blocks/ChunkInterface.cpp index 44119a0d8..6aa8fbf4f 100644 --- a/src/Blocks/ChunkInterface.cpp +++ b/src/Blocks/ChunkInterface.cpp @@ -28,7 +28,6 @@ NIBBLETYPE cChunkInterface::GetBlockMeta(Vector3i a_Pos) - bool cChunkInterface::GetBlockTypeMeta(Vector3i a_Pos, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta) { return m_ChunkMap->GetBlockTypeMeta(a_Pos.x, a_Pos.y, a_Pos.z, a_BlockType, a_BlockMeta); @@ -38,7 +37,6 @@ bool cChunkInterface::GetBlockTypeMeta(Vector3i a_Pos, BLOCKTYPE & a_BlockType, - /** Sets the block at the specified coords to the specified value. Full processing, incl. updating neighbors, is performed. */ @@ -72,7 +70,6 @@ void cChunkInterface::FastSetBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLO - void cChunkInterface::FastSetBlock(const Vector3i & a_Pos, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) { FastSetBlock( a_Pos.x, a_Pos.y, a_Pos.z, a_BlockType, a_BlockMeta); @@ -82,7 +79,6 @@ void cChunkInterface::FastSetBlock(const Vector3i & a_Pos, BLOCKTYPE a_BlockType - bool cChunkInterface::UseBlockEntity(cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) { return m_ChunkMap->UseBlockEntity(a_Player, a_BlockX, a_BlockY, a_BlockZ); @@ -92,7 +88,6 @@ bool cChunkInterface::UseBlockEntity(cPlayer * a_Player, int a_BlockX, int a_Blo - bool cChunkInterface::ForEachChunkInRect(int a_MinChunkX, int a_MaxChunkX, int a_MinChunkZ, int a_MaxChunkZ, cChunkDataCallback & a_Callback) { return m_ChunkMap->ForEachChunkInRect(a_MinChunkX, a_MaxChunkX, a_MinChunkZ, a_MaxChunkZ, a_Callback); @@ -102,7 +97,6 @@ bool cChunkInterface::ForEachChunkInRect(int a_MinChunkX, int a_MaxChunkX, int a - bool cChunkInterface::WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes) { return m_ChunkMap->WriteBlockArea(a_Area, a_MinBlockX, a_MinBlockY, a_MinBlockZ, a_DataTypes); @@ -112,7 +106,6 @@ bool cChunkInterface::WriteBlockArea(cBlockArea & a_Area, int a_MinBlockX, int a - bool cChunkInterface::DigBlock(cWorldInterface & a_WorldInterface, int a_X, int a_Y, int a_Z) { cBlockHandler * Handler = cBlockInfo::GetHandler(GetBlock({a_X, a_Y, a_Z})); diff --git a/src/Blocks/GetHandlerCompileTimeTemplate.h b/src/Blocks/GetHandlerCompileTimeTemplate.h index 3466b5426..deebd4030 100644 --- a/src/Blocks/GetHandlerCompileTimeTemplate.h +++ b/src/Blocks/GetHandlerCompileTimeTemplate.h @@ -12,7 +12,6 @@ class cBlockPistonHandler; - template<BLOCKTYPE T> class GetHandlerCompileTime; @@ -20,8 +19,6 @@ class GetHandlerCompileTime; - - template<> class GetHandlerCompileTime<E_BLOCK_TORCH> { @@ -33,7 +30,6 @@ public: - template<> class GetHandlerCompileTime<E_BLOCK_LEVER> { @@ -45,7 +41,6 @@ public: - template<> class GetHandlerCompileTime<E_BLOCK_STONE_BUTTON> { @@ -57,7 +52,6 @@ public: - template<> class GetHandlerCompileTime<E_BLOCK_TRIPWIRE_HOOK> { @@ -69,7 +63,6 @@ public: - template<> class GetHandlerCompileTime<E_BLOCK_WOODEN_DOOR> { @@ -81,7 +74,6 @@ public: - template<> class GetHandlerCompileTime<E_BLOCK_PISTON> { |