summaryrefslogtreecommitdiffstats
path: root/source/blocks/BlockCactus.h
diff options
context:
space:
mode:
authorlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-07-16 21:20:37 +0200
committerlapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-07-16 21:20:37 +0200
commit86a991c5a85a9771143320de91d87f6e986300a9 (patch)
treedee2b3b326103217b982a49c90a489eb35235392 /source/blocks/BlockCactus.h
parentFixed a copypasta error in previous commit (diff)
downloadcuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.gz
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.bz2
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.lz
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.xz
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.tar.zst
cuberite-86a991c5a85a9771143320de91d87f6e986300a9.zip
Diffstat (limited to 'source/blocks/BlockCactus.h')
-rw-r--r--source/blocks/BlockCactus.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blocks/BlockCactus.h b/source/blocks/BlockCactus.h
index 4977d4a98..5eb351d9c 100644
--- a/source/blocks/BlockCactus.h
+++ b/source/blocks/BlockCactus.h
@@ -10,12 +10,12 @@ public:
{
}
- virtual char GetDropMeta(char a_BlockMeta)
+ virtual NIBBLETYPE GetDropMeta(NIBBLETYPE a_BlockMeta) override
{
return 0;
}
- virtual bool CanBeAt(cWorld *a_World, int a_X, int a_Y, int a_Z)
+ virtual bool CanBeAt(cWorld *a_World, int a_X, int a_Y, int a_Z) override
{
BLOCKTYPE Surface = a_World->GetBlock(a_X, a_Y - 1, a_Z);
if ((Surface != E_BLOCK_SAND) && (Surface != E_BLOCK_CACTUS))
@@ -38,13 +38,13 @@ public:
return true;
}
- virtual bool AllowBlockOnTop()
+ virtual bool AllowBlockOnTop() override
{
return false;
}
- virtual bool CanBePlacedOnSide()
+ virtual bool CanBePlacedOnSide() override
{
return false;
}