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/BlockCactus.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source/Blocks/BlockCactus.h') diff --git a/source/Blocks/BlockCactus.h b/source/Blocks/BlockCactus.h index 964646299..6eec866be 100644 --- a/source/Blocks/BlockCactus.h +++ b/source/Blocks/BlockCactus.h @@ -1,5 +1,6 @@ #pragma once + #include "BlockHandler.h" @@ -16,9 +17,10 @@ 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)); } @@ -46,18 +48,17 @@ public: } - virtual bool CanBePlacedOnSide() override + virtual bool CanBePlacedOnSide(void) override { return false; } - virtual AString GetStepSound(void) override + virtual const char * GetStepSound(void) override { return "step.cloth"; } - -}; +} ; -- cgit v1.2.3