2 files changed, 110 insertions, 0 deletions

diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index cd07b3021..a4233b883 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -61,6 +61,7 @@
 #include "BlockSugarcane.h"
 #include "BlockTallGrass.h"
 #include "BlockTorch.h"
+#include "BlockTrapdoor.h"
 #include "BlockVine.h"
 #include "BlockWood.h"
 #include "BlockWorkbench.h"
@@ -193,6 +194,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
 		case E_BLOCK_SUGARCANE:             return new cBlockSugarcaneHandler       (a_BlockType);
 		case E_BLOCK_TALL_GRASS:            return new cBlockTallGrassHandler       (a_BlockType);
 		case E_BLOCK_TORCH:                 return new cBlockTorchHandler           (a_BlockType);
+		case E_BLOCK_TRAPDOOR:              return new cBlockTrapdoorHandler        (a_BlockType);
 		case E_BLOCK_VINES:                 return new cBlockVineHandler            (a_BlockType);
 		case E_BLOCK_WALLSIGN:              return new cBlockSignHandler            (a_BlockType);
 		case E_BLOCK_WATER:                 return new cBlockFluidHandler           (a_BlockType);
diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h
new file mode 100644
index 000000000..58d770d23
--- /dev/null
+++ b/src/Blocks/BlockTrapdoor.h
@@ -0,0 +1,108 @@
+
+#pragma once
+
+#include "BlockHandler.h"
+
+
+
+
+
+class cBlockTrapdoorHandler :
+	public cBlockHandler
+{
+public:
+	cBlockTrapdoorHandler(BLOCKTYPE a_BlockType)
+		: cBlockHandler(a_BlockType)
+	{
+	}
+
+	virtual const char * GetStepSound(void) override
+	{
+		return "step.wood";
+	}
+
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
+	{
+		// Reset meta to 0
+		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
+	}
+
+	virtual bool IsUseable(void) override
+	{
+		return true;
+	}
+
+	void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ)
+	{
+		// Flip the ON bit on/off using the XOR bitwise operation
+		NIBBLETYPE Meta = (a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x04);
+
+		a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta);
+	}
+
+	virtual bool GetPlacementBlockTypeMeta(
+		cWorld * a_World, cPlayer * a_Player,
+		int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace,
+		int a_CursorX, int a_CursorY, int a_CursorZ,
+		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
+		) override
+	{
+		a_BlockType = m_BlockType;
+		a_BlockMeta = BlockFaceToMetaData(a_BlockFace);
+
+		/* TODO: fix CursorY issues and uncomment this
+		if (a_CursorY > 7)
+		{
+			a_BlockMeta |= 0x8;
+		}
+		*/
+		return true;
+	}
+	
+	inline static NIBBLETYPE BlockFaceToMetaData(char a_BlockFace)
+	{
+		switch (a_BlockFace)
+		{
+			case BLOCK_FACE_ZP: return 0x1;
+			case BLOCK_FACE_ZM: return 0x0;
+			case BLOCK_FACE_XP: return 0x3;
+			case BLOCK_FACE_XM: return 0x2;
+			default:
+			{
+				ASSERT(!"Unhandled block face!");
+				return 0x0;
+			}
+		}
+	}
+
+	inline static NIBBLETYPE BlockMetaDataToBlockFace(NIBBLETYPE a_Meta)
+	{
+		switch (a_Meta & 0x3)
+		{
+			case 0x0: return BLOCK_FACE_ZM;
+			case 0x1: return BLOCK_FACE_ZP;
+			case 0x2: return BLOCK_FACE_XM;
+			case 0x3: return BLOCK_FACE_XP;
+			default:
+			{
+				ASSERT(!"Unhandled block meta!");
+				return BLOCK_FACE_NONE;
+			}
+		}
+	}
+
+	virtual bool CanBeAt(int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
+	{
+		NIBBLETYPE Meta;
+		a_Chunk.UnboundedRelGetBlockMeta(a_RelX, a_RelY, a_RelZ, Meta);
+
+		AddFaceDirection(a_RelX, a_RelY, a_RelZ, BlockMetaDataToBlockFace(Meta), true);
+		BLOCKTYPE BlockIsOn; a_Chunk.UnboundedRelGetBlockType(a_RelX, a_RelY, a_RelZ, BlockIsOn);
+
+		return (a_RelY > 0) && (g_BlockIsSolid[BlockIsOn]);
+	}
+};
+
+
+
+