From 85164fab8e5298ce1c0582b2aebb7e6a283d4a0c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" 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/BlockRedstone.h | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'source/Blocks/BlockRedstone.h') diff --git a/source/Blocks/BlockRedstone.h b/source/Blocks/BlockRedstone.h index 9b83b1b29..fa9aeef01 100644 --- a/source/Blocks/BlockRedstone.h +++ b/source/Blocks/BlockRedstone.h @@ -1,32 +1,40 @@ + #pragma once + #include "BlockHandler.h" #include "../World.h" -class cBlockRedstoneHandler : public cBlockHandler + + + + +class cBlockRedstoneHandler : + public cBlockHandler { public: cBlockRedstoneHandler(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 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 int GetDropID() override + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - return E_ITEM_REDSTONE_DUST; + // Reset meta to 0 + a_Pickups.push_back(cItem(E_ITEM_REDSTONE_DUST, 1)); } - virtual bool CanBePlacedOnSide() override + virtual bool CanBePlacedOnSide(void) override { return false; } -- cgit v1.2.3