From 221cc4ec5cb6301743e947eaabed3fecedba796f Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Wed, 16 Oct 2019 10:06:34 +0200
Subject: Refactored block-to-pickup conversion. (#4417)

---
 src/Blocks/BlockTorch.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/Blocks/BlockTorch.h')

diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h
index 8f95fa344..c5b06b18a 100644
--- a/src/Blocks/BlockTorch.h
+++ b/src/Blocks/BlockTorch.h
@@ -3,17 +3,20 @@
 #include "BlockHandler.h"
 #include "../Chunk.h"
 #include "ChunkInterface.h"
-#include "MetaRotator.h"
+#include "Mixins.h"
 
 
 
 
 class cBlockTorchHandler :
-	public cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>
+	public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>>
 {
+	using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>>;
+
 public:
-	cBlockTorchHandler(BLOCKTYPE a_BlockType)
-		: cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>(a_BlockType)
+
+	cBlockTorchHandler(BLOCKTYPE a_BlockType):
+		super(a_BlockType)
 	{
 	}
 
@@ -182,12 +185,6 @@ public:
 		return CanBePlacedOn(BlockInQuestion, BlockInQuestionMeta, Face);
 	}
 
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
-	{
-		// Always drop meta = 0
-		a_Pickups.push_back(cItem(m_BlockType, 1, 0));
-	}
-
 	virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override
 	{
 		UNUSED(a_Meta);
-- 
cgit v1.2.3