flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Converted some blockhandlers to use cClearMetaOnDrop

Browse Source
This commit is contained in:
Tycho 2014-07-14 20:50:56 +01:00
parent 093b5c6456
commit 333f4f982c
9 changed files with 21 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Blocks/BlockBrewingStand.h
View File

@ -2,25 +2,21 @@
#pragma once #pragma once
#include "BlockHandler.h" #include "BlockHandler.h"
#include "ClearMetaOnDrop.h"
class cBlockBrewingStandHandler : class cBlockBrewingStandHandler :
public cBlockHandler public cClearMetaOnDrop<cBlockHandler>
{ {
public: public:
cBlockBrewingStandHandler(BLOCKTYPE a_BlockType) cBlockBrewingStandHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType) : cClearMetaOnDrop<cBlockHandler>(a_BlockType)
{ {
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_ITEM_BREWING_STAND, 1, 0));
}
virtual bool IsUseable() override virtual bool IsUseable() override
{ {
return true; return true;

10
src/Blocks/BlockCobWeb.h
View File

@ -10,19 +10,13 @@
class cBlockCobWebHandler : class cBlockCobWebHandler :
public cBlockHandler public cClearMetaOnDrop<cBlockHandler>
{ {
public: public:
cBlockCobWebHandler(BLOCKTYPE a_BlockType) cBlockCobWebHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType) : cClearMetaOnDrop<cBlockHandler>(a_BlockType)
{ {
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_Meta) override
{
a_Pickups.push_back(cItem(E_ITEM_STRING, 1, 0));
}
} ; } ;

9
src/Blocks/BlockFlowerPot.h
View File

@ -9,18 +9,13 @@
class cBlockFlowerPotHandler : class cBlockFlowerPotHandler :
public cBlockEntityHandler public cClearMetaOnDrop<cBlockEntityHandler>
{ {
public: public:
cBlockFlowerPotHandler(BLOCKTYPE a_BlockType) : cBlockFlowerPotHandler(BLOCKTYPE a_BlockType) :
cBlockEntityHandler(a_BlockType) cClearMetaOnDrop<cBlockEntityHandler>(a_BlockType)
{ {
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_ITEM_FLOWER_POT, 1, 0));
}
} ; } ;

9
src/Blocks/BlockLilypad.h
View File

@ -8,19 +8,14 @@
class cBlockLilypadHandler : class cBlockLilypadHandler :
public cBlockHandler public cClearMetaOnDrop<cBlockHandler>
{ {
public: public:
cBlockLilypadHandler(BLOCKTYPE a_BlockType) cBlockLilypadHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType) : cClearMetaOnDrop<cBlockHandler>(a_BlockType)
{ {
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Reset meta to zero
a_Pickups.push_back(cItem(E_BLOCK_LILY_PAD, 1, 0));
}
}; };

8
src/Blocks/BlockMycelium.h
View File

@ -8,20 +8,16 @@
class cBlockMyceliumHandler : class cBlockMyceliumHandler :
public cBlockHandler public cClearMetaOnDrop<cBlockHandler>
{ {
public: public:
cBlockMyceliumHandler(BLOCKTYPE a_BlockType) cBlockMyceliumHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType) : cClearMetaOnDrop<cBlockHandler>(a_BlockType)
{ {
} }
// TODO: Add Mycel Spread // TODO: Add Mycel Spread
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_DIRT, 1, 0));
}
virtual const char * GetStepSound(void) override virtual const char * GetStepSound(void) override
{ {

11
src/Blocks/BlockRedstone.h
View File

@ -9,11 +9,11 @@
class cBlockRedstoneHandler : class cBlockRedstoneHandler :
public cBlockHandler public cClearMetaOnDrop<cBlockHandler>
{ {
public: public:
cBlockRedstoneHandler(BLOCKTYPE a_BlockType) cBlockRedstoneHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType) : cClearMetaOnDrop<cBlockHandler>(a_BlockType)
{ {
} }
@ -22,13 +22,6 @@ public:
{ {
return ((a_RelY > 0) && cBlockInfo::FullyOccupiesVoxel(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ))); return ((a_RelY > 0) && cBlockInfo::FullyOccupiesVoxel(a_Chunk.GetBlock(a_RelX, a_RelY - 1, a_RelZ)));
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Reset meta to 0
a_Pickups.push_back(cItem(E_ITEM_REDSTONE_DUST, 1));
}
} ; } ;

9
src/Blocks/BlockRedstoneLamp.h
View File

@ -8,18 +8,13 @@
class cBlockRedstoneLampHandler : class cBlockRedstoneLampHandler :
public cBlockHandler public cClearMetaOnDrop<cBlockHandler>
{ {
public: public:
cBlockRedstoneLampHandler(BLOCKTYPE a_BlockType) cBlockRedstoneLampHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType) : cClearMetaOnDrop<cBlockHandler>(a_BlockType)
{ {
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_REDSTONE_LAMP_OFF, 1, 0));
}
}; };

13
src/Blocks/BlockRedstoneRepeater.h
View File

@ -4,16 +4,16 @@
#include "BlockHandler.h" #include "BlockHandler.h"
#include "Chunk.h" #include "Chunk.h"
#include "MetaRotator.h" #include "MetaRotator.h"
#include "ClearMetaOnDrop.h"
class cBlockRedstoneRepeaterHandler : class cBlockRedstoneRepeaterHandler :
public cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true> public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true> >
{ {
public: public:
cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType) cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType)
: cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>(a_BlockType) : cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true> >(a_BlockType)
{ {
} }
@ -44,13 +44,6 @@ public:
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Reset meta to 0
a_Pickups.push_back(cItem(E_ITEM_REDSTONE_REPEATER, 1, 0));
}
virtual bool IsUseable(void) override virtual bool IsUseable(void) override
{ {
return true; return true;

9
src/Blocks/BlockStone.h
View File

@ -2,24 +2,21 @@
#pragma once #pragma once
#include "BlockHandler.h" #include "BlockHandler.h"
#include "ClearMetaOnDrop.h"
class cBlockStoneHandler : class cBlockStoneHandler :
public cBlockHandler public cClearMetaOnDrop<cBlockHandler>
{ {
public: public:
cBlockStoneHandler(BLOCKTYPE a_BlockType) cBlockStoneHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType) : cClearMetaOnDrop<cBlockHandler>(a_BlockType)
{ {
} }
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
}
} ; } ;