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/BlockMushroom.h | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'source/Blocks/BlockMushroom.h') diff --git a/source/Blocks/BlockMushroom.h b/source/Blocks/BlockMushroom.h index c4119bad0..a74eacbc3 100644 --- a/source/Blocks/BlockMushroom.h +++ b/source/Blocks/BlockMushroom.h @@ -1,8 +1,14 @@ + #pragma once + #include "BlockHandler.h" -class cBlockMushroomHandler : public cBlockHandler + + + +class cBlockMushroomHandler : + public cBlockHandler { public: cBlockMushroomHandler(BLOCKTYPE a_BlockID) @@ -10,12 +16,15 @@ public: { } - virtual NIBBLETYPE GetDropMeta(NIBBLETYPE a_BlockMeta) override + + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - return 0; + // Reset meta to 0 + a_Pickups.push_back(cItem(m_BlockID, 1, 0)); } - 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 { switch (a_World->GetBlock(a_X, a_Y - 1, a_Z)) { @@ -24,24 +33,32 @@ public: case E_BLOCK_ICE: case E_BLOCK_LEAVES: case E_BLOCK_AIR: + { return false; + } } return true; } - virtual bool AllowBlockOnTop() override + + virtual bool DoesAllowBlockOnTop(void) override { return false; } - virtual bool CanBePlacedOnSide() override + virtual bool CanBePlacedOnSide(void) override { return false; } + - virtual AString GetStepSound(void) override + virtual const char * GetStepSound(void) override { return "step.grass"; } -}; +} ; + + + + -- cgit v1.2.3