From 85164fab8e5298ce1c0582b2aebb7e6a283d4a0c Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 1 Oct 2012 21:08:15 +0000
Subject: Slight refactoring of BlockHandlers - dropping unneeded virtual
 functions (
 http://forum.mc-server.org/showthread.php?tid=434&pid=4734#pid4734 )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@917 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/Blocks/BlockTallGrass.h | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

(limited to 'source/Blocks/BlockTallGrass.h')

diff --git a/source/Blocks/BlockTallGrass.h b/source/Blocks/BlockTallGrass.h
index f5bb1b373..20714832f 100644
--- a/source/Blocks/BlockTallGrass.h
+++ b/source/Blocks/BlockTallGrass.h
@@ -1,8 +1,14 @@
+
 #pragma once
+
 #include "BlockHandler.h"
 
 
-class cBlockTallGrassHandler : public cBlockHandler
+
+
+
+class cBlockTallGrassHandler :
+	public cBlockHandler
 {
 public:
 	cBlockTallGrassHandler(BLOCKTYPE a_BlockID)
@@ -10,32 +16,36 @@ public:
 	{
 	}
 	
-	virtual bool IgnoreBuildCollision() override
+	
+	virtual bool DoesIgnoreBuildCollision(void) override
 	{
 		return true;
 	}
 	
-	virtual int GetDropID() override
-	{
-		return E_ITEM_SEEDS;
-	}
-
-	virtual char GetDropCount() override
+	
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
+		// Drop seeds, sometimes
 		MTRand r1;
-		if(r1.randInt(10) == 5)
-			return 1;
-		return 0;
+		if (r1.randInt(10) == 5)
+		{
+			a_Pickups.push_back(cItem(E_ITEM_SEEDS, 1, 0));
+		}
 	}
 
-	virtual bool CanBeAt(cWorld *a_World, int a_X, int a_Y, int a_Z) override
+
+	virtual bool CanBeAt(cWorld * a_World, int a_X, int a_Y, int a_Z) override
 	{
 		return a_World->GetBlock(a_X, a_Y - 1, a_Z) != E_BLOCK_AIR;
 	}
+	
 
-	virtual AString GetStepSound(void) override
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
+} ;
+
+
+
 
-};
-- 
cgit v1.2.3