summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetchip <w00tc0d3@outlook.com>2014-09-29 17:18:20 +0200
committernetchip <w00tc0d3@outlook.com>2014-09-29 17:18:20 +0200
commit6127c21af97e450037daecd981cc88f40c3af423 (patch)
tree53f16633b953fbbed4d1bdfed1fc3e3f1787e424
parentMerge pull request #1479 from SphinxC0re/master (diff)
downloadcuberite-6127c21af97e450037daecd981cc88f40c3af423.tar
cuberite-6127c21af97e450037daecd981cc88f40c3af423.tar.gz
cuberite-6127c21af97e450037daecd981cc88f40c3af423.tar.bz2
cuberite-6127c21af97e450037daecd981cc88f40c3af423.tar.lz
cuberite-6127c21af97e450037daecd981cc88f40c3af423.tar.xz
cuberite-6127c21af97e450037daecd981cc88f40c3af423.tar.zst
cuberite-6127c21af97e450037daecd981cc88f40c3af423.zip
Diffstat (limited to '')
-rw-r--r--src/BlockID.h6
-rw-r--r--src/Blocks/BlockStone.h12
2 files changed, 15 insertions, 3 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index 45e71d85d..80b5700a8 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -652,6 +652,12 @@ enum
E_META_STAINED_GLASS_PANE_RED = 14,
E_META_STAINED_GLASS_PANE_BLACK = 15,
+ // E_BLOCK_STONE metas:
+ E_META_STONE = 0,
+ E_META_STONE_GRANITE = 1,
+ E_META_STONE_DIORITE = 3,
+ E_META_STONE_ANDESITE = 5,
+
// E_BLOCK_STONE_SLAB metas:
E_META_STONE_SLAB_STONE = 0,
E_META_STONE_SLAB_SANDSTONE = 1,
diff --git a/src/Blocks/BlockStone.h b/src/Blocks/BlockStone.h
index cd5230f49..2b71cebf1 100644
--- a/src/Blocks/BlockStone.h
+++ b/src/Blocks/BlockStone.h
@@ -2,7 +2,7 @@
#pragma once
#include "BlockHandler.h"
-
+#include "BlockID.h"
@@ -18,9 +18,15 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
+ switch(a_BlockMeta) {
+ case E_META_STONE:
+ a_Pickups.push_back(cItem(E_BLOCK_COBBLESTONE, 1, 0));
+ break;
+ default:
+ a_Pickups.push_back(cItem(E_BLOCK_STONE, 1, a_BlockMeta));
+ }
}
-} ;
+};