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/BlockSign.h | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'source/Blocks/BlockSign.h') diff --git a/source/Blocks/BlockSign.h b/source/Blocks/BlockSign.h index dd82605b3..9c6bf3ec6 100644 --- a/source/Blocks/BlockSign.h +++ b/source/Blocks/BlockSign.h @@ -1,27 +1,36 @@ + #pragma once + #include "BlockHandler.h" #include "../World.h" #include "../Sign.h" #include "../Player.h" -class cBlockSignHandler : public cBlockHandler + + + + +class cBlockSignHandler : + public cBlockHandler { public: cBlockSignHandler(BLOCKTYPE a_BlockID) : cBlockHandler(a_BlockID) { - } + - 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 { BLOCKTYPE Block; NIBBLETYPE Meta; - if(a_Dir == 1) + if (a_Dir == BLOCK_FACE_TOP) { Meta = cSign::RotationToMetaData(a_Player->GetRotation()); Block = E_BLOCK_SIGN_POST; - }else{ + } + else + { Meta = cSign::DirectionToMetaData(a_Dir); Block = E_BLOCK_WALLSIGN; } @@ -30,18 +39,25 @@ public: OnPlacedByPlayer(a_World, a_Player, a_X, a_Y, a_Z, a_Dir); } - virtual int GetDropID() override + + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - return E_ITEM_SIGN; + a_Pickups.push_back(cItem(E_ITEM_SIGN, 1, 0)); } + - virtual bool AllowBlockOnTop() override + virtual bool DoesAllowBlockOnTop(void) override { return false; } + - virtual AString GetStepSound(void) override + virtual const char * GetStepSound(void) override { return "step.wood"; } -}; +} ; + + + + -- cgit v1.2.3