From ea2ed2c918bddf773bb8d10298016f4e5309d0b2 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 3 Oct 2012 08:52:11 +0000 Subject: Moved blockticking into blockhandler classes. Also slightly refactored the variable / argument names (BlockID is deprecated, use BlockType instead) git-svn-id: http://mc-server.googlecode.com/svn/trunk@921 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Blocks/BlockMushroom.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/Blocks/BlockMushroom.h') diff --git a/source/Blocks/BlockMushroom.h b/source/Blocks/BlockMushroom.h index a74eacbc3..96bdbc310 100644 --- a/source/Blocks/BlockMushroom.h +++ b/source/Blocks/BlockMushroom.h @@ -11,8 +11,8 @@ class cBlockMushroomHandler : public cBlockHandler { public: - cBlockMushroomHandler(BLOCKTYPE a_BlockID) - : cBlockHandler(a_BlockID) + cBlockMushroomHandler(BLOCKTYPE a_BlockType) + : cBlockHandler(a_BlockType) { } @@ -20,13 +20,13 @@ public: virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { // Reset meta to 0 - a_Pickups.push_back(cItem(m_BlockID, 1, 0)); + a_Pickups.push_back(cItem(m_BlockType, 1, 0)); } - virtual bool CanBeAt(cWorld * a_World, int a_X, int a_Y, int a_Z) override + virtual bool CanBeAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override { - switch (a_World->GetBlock(a_X, a_Y - 1, a_Z)) + switch (a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ)) { case E_BLOCK_GLASS: case E_BLOCK_CACTUS: -- cgit v1.2.3