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/BlockCrops.h | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

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

diff --git a/source/Blocks/BlockCrops.h b/source/Blocks/BlockCrops.h
index b30139e79..d288a597f 100644
--- a/source/Blocks/BlockCrops.h
+++ b/source/Blocks/BlockCrops.h
@@ -11,54 +11,47 @@ public:
 	{
 	}
 
-	virtual bool NeedsRandomTicks() override
-	{
-		return true;
-	}
 
-	virtual bool AllowBlockOnTop() override
+	virtual bool DoesAllowBlockOnTop() override
 	{
 		return false;
 	}
 
-	virtual int GetDropID() override
-	{
-		return E_ITEM_EMPTY;
-	}
-	
-	virtual void OnDestroyed(cWorld *a_World, int a_X, int a_Y, int a_Z) override
+
+	virtual void OnDestroyed(cWorld * a_World, int a_X, int a_Y, int a_Z) override
 	{
 		MTRand rand;
 		NIBBLETYPE Meta = a_World->GetBlockMeta(a_X, a_Y, a_Z);
 
 		cItems Drops;
 
-		if(Meta & 0x7)	//Is Wheat
+		if (Meta & 0x7)  // Is Wheat
 		{
 			Drops.push_back(cItem(E_ITEM_WHEAT, 1, 0));
 		}
-		if(rand.randInt(3) == 0)
-		{	//Drop an second seed
-			Drops.push_back(cItem(E_ITEM_SEEDS, 1, 0));
-		}
-		Drops.push_back(cItem(E_ITEM_SEEDS, 1, 0));
+		Drops.push_back(cItem(E_ITEM_SEEDS, (rand.randInt(3) == 0) ? 2 : 1, 0));
 		a_World->SpawnItemPickups(Drops, a_X, a_Y, a_Z);
 	}	
 	
-	void OnUpdate(cWorld *a_World, int a_X, int a_Y, int a_Z) override
+	
+	void OnUpdate(cWorld * a_World, int a_X, int a_Y, int a_Z) override
 	{
-
-		//TODO: Handle Growing here
+		// TODO: Handle Growing here
 	}
 
-	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_FARMLAND;
 	}
 
-	virtual AString GetStepSound(void) override
+
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.grass";
 	}
-	
-};
+} ;
+
+
+
+
-- 
cgit v1.2.3