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/BlockDoor.cpp | 53 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 15 deletions(-)

(limited to 'source/Blocks/BlockDoor.cpp')

diff --git a/source/Blocks/BlockDoor.cpp b/source/Blocks/BlockDoor.cpp
index deed8a256..da9b7d161 100644
--- a/source/Blocks/BlockDoor.cpp
+++ b/source/Blocks/BlockDoor.cpp
@@ -1,3 +1,4 @@
+
 #include "Globals.h"
 #include "BlockDoor.h"
 #include "../Item.h"
@@ -6,17 +7,28 @@
 #include "../Player.h"
 
 
+
+
+
 cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockID)
 	: cBlockHandler(a_BlockID)
 {
 }
 
-void cBlockDoorHandler::OnPlaced(cWorld *a_World, int a_X, int a_Y, int a_Z, int a_Dir)
+
+
+
+
+void cBlockDoorHandler::OnPlaced(cWorld * a_World, int a_X, int a_Y, int a_Z, int a_Dir)
 {
 
 }
 
-void cBlockDoorHandler::OnDestroyed(cWorld *a_World, int a_X, int a_Y, int a_Z)
+
+
+
+
+void cBlockDoorHandler::OnDestroyed(cWorld * a_World, int a_X, int a_Y, int a_Z)
 {
 	char OldMeta = a_World->GetBlockMeta(a_X, a_Y, a_Z);
 
@@ -38,22 +50,29 @@ void cBlockDoorHandler::OnDestroyed(cWorld *a_World, int a_X, int a_Y, int a_Z)
 	}
 }
 
-void cBlockDoorHandler::OnDigging(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y, int a_Z)
+
+
+
+
+void cBlockDoorHandler::OnDigging(cWorld * a_World, cPlayer * a_Player, int a_X, int a_Y, int a_Z)
 {
 	cDoors::ChangeDoor(a_World, a_X, a_Y, a_Z);
 }
 
-void cBlockDoorHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y, int a_Z)
+
+
+
+
+void cBlockDoorHandler::OnUse(cWorld * a_World, cPlayer * a_Player, int a_X, int a_Y, int a_Z)
 {
 	cDoors::ChangeDoor(a_World, a_X, a_Y, a_Z);
 }
 
-char cBlockDoorHandler::GetDropCount()
-{
-	return 1;
-}
 
-void cBlockDoorHandler::PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir)
+
+
+
+void cBlockDoorHandler::PlaceBlock(cWorld * a_World, cPlayer * a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir)
 {
 	if (a_World->GetBlock(a_X, a_Y + 1, a_Z) == E_BLOCK_AIR)
 	{
@@ -64,11 +83,15 @@ void cBlockDoorHandler::PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYP
 	}
 }
 
-AString cBlockDoorHandler::GetStepSound(void)
-{
-		if (m_BlockID == E_BLOCK_WOODEN_DOOR)
-			return "step.wood";
 
-		else
-			return "step.stone";
+
+
+
+const char * cBlockDoorHandler::GetStepSound(void)
+{
+	return (m_BlockID == E_BLOCK_WOODEN_DOOR) ? "step.wood" : "step.stone";
 }
+
+
+
+
-- 
cgit v1.2.3