diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-19 20:22:37 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-05-19 20:22:37 +0200 |
| commit | 90c398a3926f097e51955817e2829d831ae2bd2b (patch) | |
| tree | af4e2d236a5e0595f19975dcd2295c60c4a59712 /source/Items/ItemSlab.h | |
| parent | Debuggers: sorted things into separate functions, commented out most of them; added ForEachEntity() testing - list all and kill all entities. (diff) | |
| download | cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.gz cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.bz2 cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.lz cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.xz cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.zst cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.zip | |
Diffstat (limited to 'source/Items/ItemSlab.h')
| -rw-r--r-- | source/Items/ItemSlab.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/Items/ItemSlab.h b/source/Items/ItemSlab.h index 42311d54d..9f4760053 100644 --- a/source/Items/ItemSlab.h +++ b/source/Items/ItemSlab.h @@ -17,7 +17,7 @@ public: }
- virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, cItem * a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override
+ virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override
{
BLOCKTYPE Block;
NIBBLETYPE Meta;
@@ -26,8 +26,8 @@ public: if (
((a_Dir == 0) || (a_Dir == 1)) // Only when clicking on top or on bottom of the block
&& ((Block == E_BLOCK_WOODEN_SLAB) || (Block == E_BLOCK_STONE_SLAB)) // It is a slab
- && (Block == a_Item->m_ItemType) // Same slab
- && ((Meta & 0x7) == (a_Item->m_ItemDamage & 0x7))) // Same Texture
+ && (Block == a_Item.m_ItemType) // Same slab
+ && ((Meta & 0x7) == (a_Item.m_ItemDamage & 0x7))) // Same Texture
{
if (a_Player->GetGameMode() == eGameMode_Creative)
{
@@ -36,7 +36,7 @@ public: }
else
{
- cItem Item(a_Item->m_ItemType, 1);
+ cItem Item(a_Item.m_ItemType, 1);
if (a_Player->GetInventory().RemoveItem(Item))
{
a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, Block - 1, Meta); // Block - 1 simple hack to save one if statement
|