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/BlockSlab.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'source/Blocks/BlockSlab.h') diff --git a/source/Blocks/BlockSlab.h b/source/Blocks/BlockSlab.h index ad9970d67..2e9a6faf4 100644 --- a/source/Blocks/BlockSlab.h +++ b/source/Blocks/BlockSlab.h @@ -1,8 +1,14 @@ + #pragma once + #include "BlockHandler.h" -class cBlockSlabHandler : public cBlockHandler + + + +class cBlockSlabHandler : + public cBlockHandler { public: cBlockSlabHandler(BLOCKTYPE a_BlockID) @@ -10,17 +16,11 @@ public: { } - virtual NIBBLETYPE GetDropMeta(NIBBLETYPE a_BlockMeta) override - { - return a_BlockMeta; - } - - virtual char GetDropCount() override + + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - if(m_BlockID == E_BLOCK_DOUBLE_STONE_SLAB - || m_BlockID == E_BLOCK_DOUBLE_WOODEN_SLAB) - return 2; - return 1; + char Count = ((m_BlockID == E_BLOCK_DOUBLE_STONE_SLAB) || (m_BlockID == E_BLOCK_DOUBLE_WOODEN_SLAB)) ? 2 : 1; + a_Pickups.push_back(cItem(m_BlockID, Count, a_BlockMeta)); } @@ -30,6 +30,7 @@ public: OnPlacedByPlayer(a_World, a_Player, a_X, a_Y, a_Z, a_Dir); } + static char DirectionToMetaData( char a_Direction, NIBBLETYPE Meta ) { char result = Meta; @@ -40,12 +41,13 @@ public: return result; } - virtual AString GetStepSound(void) override - { - if (m_BlockID == E_BLOCK_WOODEN_SLAB || m_BlockID ==E_BLOCK_DOUBLE_WOODEN_SLAB) - return "step.wood"; - else - return "step.stone"; + virtual const char * GetStepSound(void) override + { + return ((m_BlockID == E_BLOCK_WOODEN_SLAB) || (m_BlockID == E_BLOCK_DOUBLE_WOODEN_SLAB)) ? "step.wood" : "step.stone"; } -}; +} ; + + + + -- cgit v1.2.3