summaryrefslogtreecommitdiffstats
path: root/source/Blocks/BlockSlab.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-01 23:08:15 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-01 23:08:15 +0200
commit85164fab8e5298ce1c0582b2aebb7e6a283d4a0c (patch)
tree6fdaf7f724044a025ecc9f1a8cadf8ee61d9355d /source/Blocks/BlockSlab.h
parentAdded some missing block enums (diff)
downloadcuberite-85164fab8e5298ce1c0582b2aebb7e6a283d4a0c.tar
cuberite-85164fab8e5298ce1c0582b2aebb7e6a283d4a0c.tar.gz
cuberite-85164fab8e5298ce1c0582b2aebb7e6a283d4a0c.tar.bz2
cuberite-85164fab8e5298ce1c0582b2aebb7e6a283d4a0c.tar.lz
cuberite-85164fab8e5298ce1c0582b2aebb7e6a283d4a0c.tar.xz
cuberite-85164fab8e5298ce1c0582b2aebb7e6a283d4a0c.tar.zst
cuberite-85164fab8e5298ce1c0582b2aebb7e6a283d4a0c.zip
Diffstat (limited to 'source/Blocks/BlockSlab.h')
-rw-r--r--source/Blocks/BlockSlab.h38
1 files changed, 20 insertions, 18 deletions
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";
}
-};
+} ;
+
+
+
+