summaryrefslogtreecommitdiffstats
path: root/src/Defines.h
diff options
context:
space:
mode:
authormathiascode <mathiascode@users.noreply.github.com>2017-02-14 11:13:55 +0100
committerMattes D <github@xoft.cz>2017-02-14 11:13:55 +0100
commit4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6 (patch)
tree7164954ec1ca29c34623248ff413d007268a17e8 /src/Defines.h
parentImproved easyinstall.sh to support macOS and FreeBSD (#3557) (diff)
downloadcuberite-4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6.tar
cuberite-4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6.tar.gz
cuberite-4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6.tar.bz2
cuberite-4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6.tar.lz
cuberite-4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6.tar.xz
cuberite-4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6.tar.zst
cuberite-4311f4a658fe2bef362aeb9b4bdbcd59c9617ad6.zip
Diffstat (limited to '')
-rw-r--r--src/Defines.h26
1 files changed, 25 insertions, 1 deletions
diff --git a/src/Defines.h b/src/Defines.h
index a1de94897..172d5e30d 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -173,6 +173,7 @@ enum eMobHeadType
SKULL_TYPE_ZOMBIE = 2,
SKULL_TYPE_PLAYER = 3,
SKULL_TYPE_CREEPER = 4,
+ SKULL_TYPE_DRAGON = 5,
} ;
@@ -455,9 +456,30 @@ inline bool IsBlockWater(BLOCKTYPE a_BlockType)
+inline bool IsBlockIce(BLOCKTYPE a_BlockType)
+{
+ switch (a_BlockType)
+ {
+ case E_BLOCK_ICE:
+ case E_BLOCK_PACKED_ICE:
+ case E_BLOCK_FROSTED_ICE:
+ {
+ return true;
+ }
+ default:
+ {
+ return false;
+ }
+ }
+}
+
+
+
+
+
inline bool IsBlockWaterOrIce(BLOCKTYPE a_BlockType)
{
- return (IsBlockWater(a_BlockType) || (a_BlockType == E_BLOCK_ICE));
+ return (IsBlockWater(a_BlockType) || IsBlockIce(a_BlockType));
}
@@ -507,6 +529,7 @@ inline bool IsBlockTypeOfDirt(BLOCKTYPE a_BlockType)
case E_BLOCK_DIRT:
case E_BLOCK_GRASS:
case E_BLOCK_FARMLAND:
+ case E_BLOCK_GRASS_PATH:
{
return true;
}
@@ -832,6 +855,7 @@ inline bool IsBlockMaterialRock(BLOCKTYPE a_BlockType)
case E_BLOCK_MAGMA:
case E_BLOCK_RED_NETHER_BRICK:
case E_BLOCK_BONE_BLOCK:
+ case E_BLOCK_OBSERVER:
{
return true;
}