From 333f4f982cbd24ffcb376594eddef439b3f05e9e Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Mon, 14 Jul 2014 20:50:56 +0100
Subject: Converted some blockhandlers to use cClearMetaOnDrop

---
 src/Blocks/BlockLilypad.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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

diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h
index 2dd4ec768..fc37f360c 100644
--- a/src/Blocks/BlockLilypad.h
+++ b/src/Blocks/BlockLilypad.h
@@ -8,19 +8,14 @@
 
 
 class cBlockLilypadHandler :
-	public cBlockHandler
+	public cClearMetaOnDrop<cBlockHandler>
 {
 public:
 	cBlockLilypadHandler(BLOCKTYPE a_BlockType)
-		: cBlockHandler(a_BlockType)
+		: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
 	{
 	}
 	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
-	{
-		// Reset meta to zero
-		a_Pickups.push_back(cItem(E_BLOCK_LILY_PAD, 1, 0));
-	}
 };
 
 
-- 
cgit v1.2.3


From 8fd636aa7235698263e3b85388a4f6373cbedb76 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Mon, 14 Jul 2014 23:59:24 +0100
Subject: Revert "Converted some blockhandlers to use cClearMetaOnDrop"

This reverts commit 333f4f982cbd24ffcb376594eddef439b3f05e9e.
---
 src/Blocks/BlockLilypad.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h
index fc37f360c..2dd4ec768 100644
--- a/src/Blocks/BlockLilypad.h
+++ b/src/Blocks/BlockLilypad.h
@@ -8,14 +8,19 @@
 
 
 class cBlockLilypadHandler :
-	public cClearMetaOnDrop<cBlockHandler>
+	public cBlockHandler
 {
 public:
 	cBlockLilypadHandler(BLOCKTYPE a_BlockType)
-		: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
+		: cBlockHandler(a_BlockType)
 	{
 	}
 	
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
+	{
+		// Reset meta to zero
+		a_Pickups.push_back(cItem(E_BLOCK_LILY_PAD, 1, 0));
+	}
 };
 
 
-- 
cgit v1.2.3


From 0e5fa2662aa2b559335a25ee78cd086f795be79e Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Tue, 15 Jul 2014 00:01:16 +0100
Subject: COnverted Lilypad back to mixin

---
 src/Blocks/BlockLilypad.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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

diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h
index 2dd4ec768..c25f150c7 100644
--- a/src/Blocks/BlockLilypad.h
+++ b/src/Blocks/BlockLilypad.h
@@ -8,19 +8,13 @@
 
 
 class cBlockLilypadHandler :
-	public cBlockHandler
+	public cClearMetaOnDrop<cBlockHandler>
 {
 public:
 	cBlockLilypadHandler(BLOCKTYPE a_BlockType)
-		: cBlockHandler(a_BlockType)
+		: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
 	{
 	}
-	
-	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
-	{
-		// Reset meta to zero
-		a_Pickups.push_back(cItem(E_BLOCK_LILY_PAD, 1, 0));
-	}
 };
 
 
-- 
cgit v1.2.3


From 01a31a1872bb7c33d5a4d0a13dae083c4ef7792e Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Tue, 15 Jul 2014 12:27:36 +0100
Subject: Added super typedef

---
 src/Blocks/BlockLilypad.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h
index c25f150c7..1320174fc 100644
--- a/src/Blocks/BlockLilypad.h
+++ b/src/Blocks/BlockLilypad.h
@@ -10,9 +10,10 @@
 class cBlockLilypadHandler :
 	public cClearMetaOnDrop<cBlockHandler>
 {
+typedef cClearMetaOnDrop<cBlockHandler> super;
 public:
 	cBlockLilypadHandler(BLOCKTYPE a_BlockType)
-		: cClearMetaOnDrop<cBlockHandler>(a_BlockType)
+		: super(a_BlockType)
 	{
 	}
 };
-- 
cgit v1.2.3