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/BlockCrops.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'source/Blocks/BlockCrops.h') diff --git a/source/Blocks/BlockCrops.h b/source/Blocks/BlockCrops.h index d288a597f..24b8904ae 100644 --- a/source/Blocks/BlockCrops.h +++ b/source/Blocks/BlockCrops.h @@ -6,8 +6,8 @@ class cBlockCropsHandler : public cBlockHandler { public: - cBlockCropsHandler(BLOCKTYPE a_BlockID) - : cBlockHandler(a_BlockID) + cBlockCropsHandler(BLOCKTYPE a_BlockType) + : cBlockHandler(a_BlockType) { } @@ -18,10 +18,10 @@ public: } - virtual void OnDestroyed(cWorld * a_World, int a_X, int a_Y, int a_Z) override + virtual void OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override { MTRand rand; - NIBBLETYPE Meta = a_World->GetBlockMeta(a_X, a_Y, a_Z); + NIBBLETYPE Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); cItems Drops; @@ -30,19 +30,23 @@ public: Drops.push_back(cItem(E_ITEM_WHEAT, 1, 0)); } Drops.push_back(cItem(E_ITEM_SEEDS, (rand.randInt(3) == 0) ? 2 : 1, 0)); - a_World->SpawnItemPickups(Drops, a_X, a_Y, a_Z); + a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ); } - 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 + NIBBLETYPE Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); + if (Meta < 7) + { + a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_CROPS, ++Meta); + } } - 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 { - return a_World->GetBlock(a_X, a_Y - 1, a_Z) == E_BLOCK_FARMLAND; + return a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ) == E_BLOCK_FARMLAND; } -- cgit v1.2.3