summaryrefslogtreecommitdiffstats
path: root/source/BlockID.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2013-08-15 10:56:52 +0200
committerMattes D <github@xoft.cz>2013-08-15 10:56:52 +0200
commit1a52e89177a907b5d23d3e72f78d30a333da4bfe (patch)
tree8f2783d06d423361b02457c77f90d6ec874a5191 /source/BlockID.h
parentMerge pull request #91 from tigerw/master (diff)
parentAdded simple deadlock detection code. (diff)
downloadcuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar
cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.gz
cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.bz2
cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.lz
cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.xz
cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.tar.zst
cuberite-1a52e89177a907b5d23d3e72f78d30a333da4bfe.zip
Diffstat (limited to '')
-rw-r--r--source/BlockID.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/BlockID.h b/source/BlockID.h
index 571087ab7..58919e1aa 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -478,16 +478,16 @@ enum
E_META_TORCH_ZP = 4, // Torch attached to the ZP side of its block
// E_BLOCK_WOODEN_DOUBLE_STEP metas:
- E_BLOCK_WOODEN_DOUBLE_STEP_APPLE = 0,
- E_BLOCK_WOODEN_DOUBLE_STEP_CONIFER = 1,
- E_BLOCK_WOODEN_DOUBLE_STEP_BIRCH = 2,
- E_BLOCK_WOODEN_DOUBLE_STEP_JUNGLE = 3,
+ E_META_WOODEN_DOUBLE_STEP_APPLE = 0,
+ E_META_WOODEN_DOUBLE_STEP_CONIFER = 1,
+ E_META_WOODEN_DOUBLE_STEP_BIRCH = 2,
+ E_META_WOODEN_DOUBLE_STEP_JUNGLE = 3,
// E_BLOCK_WOODEN_STEP metas:
- E_BLOCK_WOODEN_STEP_APPLE = 0,
- E_BLOCK_WOODEN_STEP_CONIFER = 1,
- E_BLOCK_WOODEN_STEP_BIRCH = 2,
- E_BLOCK_WOODEN_STEP_JUNGLE = 3,
+ E_META_WOODEN_STEP_APPLE = 0,
+ E_META_WOODEN_STEP_CONIFER = 1,
+ E_META_WOODEN_STEP_BIRCH = 2,
+ E_META_WOODEN_STEP_JUNGLE = 3,
// E_BLOCK_WOOL metas:
E_META_WOOL_WHITE = 0,