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/BlockDirt.h | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'source/Blocks/BlockDirt.h') diff --git a/source/Blocks/BlockDirt.h b/source/Blocks/BlockDirt.h index 5a2487f1b..346815846 100644 --- a/source/Blocks/BlockDirt.h +++ b/source/Blocks/BlockDirt.h @@ -1,9 +1,17 @@ + #pragma once + #include "BlockHandler.h" #include "../MersenneTwister.h" #include "../World.h" -class cBlockDirtHandler : public cBlockHandler + + + + +/// Handler used for both dirt and grass +class cBlockDirtHandler : + public cBlockHandler { public: cBlockDirtHandler(BLOCKTYPE a_BlockID) @@ -12,18 +20,13 @@ public: } - virtual bool NeedsRandomTicks() override + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - return m_BlockID == E_BLOCK_GRASS; - } - - virtual int GetDropID() override - { - return E_BLOCK_DIRT; + a_Pickups.push_back(cItem(E_ITEM_DIRT, 1, 0)); } - 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 { if (m_BlockID != E_BLOCK_GRASS) { @@ -64,9 +67,13 @@ public: } // for i - repeat twice } - virtual AString GetStepSound(void) override + + virtual const char * GetStepSound(void) override { return "step.gravel"; } - -}; +} ; + + + + -- cgit v1.2.3