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/BlockRedstoneRepeater.h | 48 ++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 18 deletions(-)

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

diff --git a/source/Blocks/BlockRedstoneRepeater.h b/source/Blocks/BlockRedstoneRepeater.h
index a928f554f..dda3d31a7 100644
--- a/source/Blocks/BlockRedstoneRepeater.h
+++ b/source/Blocks/BlockRedstoneRepeater.h
@@ -1,52 +1,64 @@
+
 #pragma once
+
 #include "BlockHandler.h"
 #include "../World.h"
 
-class cBlockRedstoneRepeaterHandler : public cBlockHandler
+
+
+
+
+class cBlockRedstoneRepeaterHandler :
+	public cBlockHandler
 {
 public:
 	cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockID);
-	virtual void OnPlaced(cWorld *a_World, int a_X, int a_Y, int a_Z, int a_Dir) override;
-	virtual void OnDestroyed(cWorld *a_World, int a_X, int a_Y, int a_Z) override;
+	virtual void OnPlaced(cWorld * a_World, int a_X, int a_Y, int a_Z, int a_Dir) override;
+	virtual void OnDestroyed(cWorld * a_World, int a_X, int a_Y, int a_Z) override;
 	
-	virtual void OnDigging(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y, int a_Z) override;
-	virtual void OnUse(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y, int a_Z) override;
+	virtual void OnDigging(cWorld * a_World, cPlayer * a_Player, int a_X, int a_Y, int a_Z) override;
+	virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_X, int a_Y, int a_Z) override;
 
-	virtual NIBBLETYPE GetDropMeta(NIBBLETYPE a_BlockMeta) override
-	{
-		return 0;
-	}
 
-	virtual int GetDropID() override
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		return E_ITEM_REDSTONE_REPEATER;
+		// Reset meta to 0
+		a_Pickups.push_back(cItem(E_ITEM_REDSTONE_REPEATER, 1, 0));
 	}
 
-	virtual bool IsUseable() override
+
+	virtual bool IsUseable(void) override
 	{
 		return true;
 	}
 	
-	virtual void PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir) override;
+	
+	virtual void PlaceBlock(cWorld * a_World, cPlayer * a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir) override;
 
-	virtual bool AllowBlockOnTop() override
+
+	virtual bool DoesAllowBlockOnTop(void) override
 	{
 		return false;
 	}
 	
-	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 bool CanBePlacedOnSide() override
+	virtual bool CanBePlacedOnSide(void) override
 	{
 		return false;
 	}
 
-	virtual AString GetStepSound(void) override
+	virtual const char * GetStepSound(void) override
 	{
 		return "step.wood";
 	}
-};
+} ;
+
+
+
+
-- 
cgit v1.2.3