From 86a991c5a85a9771143320de91d87f6e986300a9 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Mon, 16 Jul 2012 19:20:37 +0000 Subject: Some code improvements git-svn-id: http://mc-server.googlecode.com/svn/trunk@677 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/blocks/BlockSlab.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'source/blocks/BlockSlab.h') diff --git a/source/blocks/BlockSlab.h b/source/blocks/BlockSlab.h index 05df819b2..f6443ff91 100644 --- a/source/blocks/BlockSlab.h +++ b/source/blocks/BlockSlab.h @@ -5,13 +5,17 @@ class cBlockSlabHandler : public cBlockHandler { public: - cBlockSlabHandler(BLOCKTYPE a_BlockID); - virtual char GetDropMeta(char a_BlockMeta) + cBlockSlabHandler(BLOCKTYPE a_BlockID) + : cBlockHandler(a_BlockID) + { + } + + virtual NIBBLETYPE GetDropMeta(NIBBLETYPE a_BlockMeta) override { return a_BlockMeta; } - virtual char GetDropCount() + virtual char GetDropCount() override { if(m_BlockID == E_BLOCK_DOUBLE_STONE_SLAB || m_BlockID == E_BLOCK_DOUBLE_WOODEN_SLAB) @@ -19,7 +23,12 @@ public: return 1; } - virtual void PlaceBlock(cWorld *a_World, cPlayer *a_Player, char a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir); + + virtual void PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir) override + { + a_World->SetBlock(a_X, a_Y, a_Z, m_BlockID, DirectionToMetaData( a_Dir, a_BlockMeta )); + OnPlacedByPlayer(a_World, a_Player, a_X, a_Y, a_Z, a_Dir); + } static char DirectionToMetaData( char a_Direction, NIBBLETYPE Meta ) { -- cgit v1.2.3