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

Named the different quartz block.

Browse Source
This commit is contained in:
STRWarrior 2014-02-03 22:30:32 +01:00
parent 347488a9a2
commit 70e48960ac
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BlockID.h
View File

@ -500,6 +500,11 @@ enum
E_META_PLANKS_BIRCH = 2, E_META_PLANKS_BIRCH = 2,
E_META_PLANKS_JUNGLE = 3, E_META_PLANKS_JUNGLE = 3,
// E_BLOCK_QUARTZ_BLOCK metas:
E_META_QUARTZ_NORMAL = 0,
E_META_QUARTZ_CHISELLED = 1,
E_META_QUARTZ_PILLAR = 2,
// E_BLOCK_RAIL metas // E_BLOCK_RAIL metas
E_META_RAIL_ZM_ZP = 0, E_META_RAIL_ZM_ZP = 0,
E_META_RAIL_XM_XP = 1, E_META_RAIL_XM_XP = 1,

2
src/Blocks/BlockQuartz.h
View File

@ -25,7 +25,7 @@ public:
{ {
a_BlockType = m_BlockType; a_BlockType = m_BlockType;
NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage); NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage);
if (Meta != 0x2) // Check if the block is a pillar block. if (Meta != E_META_QUARTZ_PILLAR) // Check if the block is a pillar block.
{ {
a_BlockMeta = Meta; a_BlockMeta = Meta;
return true; return true;