summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemItemFrame.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-04-15 11:07:03 +0200
committerMattes D <github@xoft.cz>2015-04-15 11:07:03 +0200
commit1d8a22cb7b867b3378b355e52ae56e2433fa7cb3 (patch)
treed5ab0c710fc93acdc2b8a2041d40c6d918fbbf33 /src/Items/ItemItemFrame.h
parentMerge pull request #1844 from DevToaster/master (diff)
parentScooping up fluid calls the player placement hooks. (diff)
downloadcuberite-1d8a22cb7b867b3378b355e52ae56e2433fa7cb3.tar
cuberite-1d8a22cb7b867b3378b355e52ae56e2433fa7cb3.tar.gz
cuberite-1d8a22cb7b867b3378b355e52ae56e2433fa7cb3.tar.bz2
cuberite-1d8a22cb7b867b3378b355e52ae56e2433fa7cb3.tar.lz
cuberite-1d8a22cb7b867b3378b355e52ae56e2433fa7cb3.tar.xz
cuberite-1d8a22cb7b867b3378b355e52ae56e2433fa7cb3.tar.zst
cuberite-1d8a22cb7b867b3378b355e52ae56e2433fa7cb3.zip
Diffstat (limited to 'src/Items/ItemItemFrame.h')
-rw-r--r--src/Items/ItemItemFrame.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h
index 5d22c1cb8..77a5bf47c 100644
--- a/src/Items/ItemItemFrame.h
+++ b/src/Items/ItemItemFrame.h
@@ -19,21 +19,26 @@ public:
}
- virtual bool OnItemUse(cWorld *a_World, cPlayer *a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
+
+
+ virtual bool OnItemUse(
+ cWorld * a_World, cPlayer * a_Player, cBlockPluginInterface & a_PluginInterface, const cItem & a_Item,
+ int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace
+ ) override
{
- if ((a_Dir == BLOCK_FACE_NONE) || (a_Dir == BLOCK_FACE_YP) || (a_Dir == BLOCK_FACE_YM))
+ if ((a_BlockFace == BLOCK_FACE_NONE) || (a_BlockFace == BLOCK_FACE_YP) || (a_BlockFace == BLOCK_FACE_YM))
{
// Client sends this if clicked on top or bottom face
return false;
}
- AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir); // Make sure block that will be occupied is free
+ AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace); // Make sure block that will be occupied is free
BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
- AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_Dir, true); // We want the clicked block, so go back again
+ AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, true); // We want the clicked block, so go back again
if (Block == E_BLOCK_AIR)
{
- cItemFrame * ItemFrame = new cItemFrame(a_Dir, a_BlockX, a_BlockY, a_BlockZ);
+ cItemFrame * ItemFrame = new cItemFrame(a_BlockFace, a_BlockX, a_BlockY, a_BlockZ);
if (!ItemFrame->Initialize(*a_World))
{
delete ItemFrame;