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/BlockSugarcane.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'source/Blocks/BlockSugarcane.h') diff --git a/source/Blocks/BlockSugarcane.h b/source/Blocks/BlockSugarcane.h index 28ffd8aa6..9470900f0 100644 --- a/source/Blocks/BlockSugarcane.h +++ b/source/Blocks/BlockSugarcane.h @@ -11,8 +11,8 @@ class cBlockSugarcaneHandler : public cBlockHandler { public: - cBlockSugarcaneHandler(BLOCKTYPE a_BlockID) - : cBlockHandler(a_BlockID) + cBlockSugarcaneHandler(BLOCKTYPE a_BlockType) + : cBlockHandler(a_BlockType) { } @@ -23,16 +23,16 @@ public: } - 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_DIRT: case E_BLOCK_GRASS: case E_BLOCK_FARMLAND: case E_BLOCK_SAND: { - return a_World->IsBlockDirectlyWatered(a_X, a_Y - 1, a_Z); + return a_World->IsBlockDirectlyWatered(a_BlockX, a_BlockY - 1, a_BlockZ); } case E_BLOCK_SUGARCANE: { @@ -43,17 +43,18 @@ public: } - void OnUpdate(cWorld * a_World, int a_X, int a_Y, int a_Z) override + void OnUpdate(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override { - // TODO: Handle Growing here + a_World->GrowSugarcane(a_BlockX, a_BlockY, a_BlockZ, 1); } - + virtual bool CanBePlacedOnSide() override { return false; } + virtual const char * GetStepSound(void) override { return "step.grass"; -- cgit v1.2.3