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/BlockIce.h | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'source/Blocks/BlockIce.h') diff --git a/source/Blocks/BlockIce.h b/source/Blocks/BlockIce.h index cc5cc8920..31a92db53 100644 --- a/source/Blocks/BlockIce.h +++ b/source/Blocks/BlockIce.h @@ -1,9 +1,15 @@ + #pragma once + #include "BlockHandler.h" -#include "../MersenneTwister.h" #include "../World.h" -class cBlockIceHandler : public cBlockHandler + + + + +class cBlockIceHandler : + public cBlockHandler { public: cBlockIceHandler(BLOCKTYPE a_BlockID) @@ -11,16 +17,21 @@ public: { } - virtual int GetDropID() override + + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - return E_ITEM_EMPTY; + // No pickups } - virtual void OnDestroyed(cWorld *a_World, int a_X, int a_Y, int a_Z) override + + virtual void OnDestroyed(cWorld * a_World, int a_X, int a_Y, int a_Z) override { + // TODO: Ice destroyed with air below it should turn into air instead of water a_World->FastSetBlock(a_X, a_Y, a_Z, E_BLOCK_STATIONARY_WATER, 8); - //This is called later than the real destroying of this ice block + // This is called later than the real destroying of this ice block } - - -}; \ No newline at end of file +} ; + + + + -- cgit v1.2.3