diff options
| author | Mattes D <github@xoft.cz> | 2015-04-15 11:07:03 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-04-15 11:07:03 +0200 |
| commit | 1d8a22cb7b867b3378b355e52ae56e2433fa7cb3 (patch) | |
| tree | d5ab0c710fc93acdc2b8a2041d40c6d918fbbf33 /src/Items/ItemPainting.h | |
| parent | Merge pull request #1844 from DevToaster/master (diff) | |
| parent | Scooping up fluid calls the player placement hooks. (diff) | |
| download | cuberite-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/ItemPainting.h')
| -rw-r--r-- | src/Items/ItemPainting.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Items/ItemPainting.h b/src/Items/ItemPainting.h index d6f2e24b4..dd35931dd 100644 --- a/src/Items/ItemPainting.h +++ b/src/Items/ItemPainting.h @@ -19,15 +19,20 @@ 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_YM) || (a_Dir == BLOCK_FACE_YP)) + if ((a_BlockFace == BLOCK_FACE_NONE) || (a_BlockFace == BLOCK_FACE_YM) || (a_BlockFace == BLOCK_FACE_YP)) { // Paintings can't be flatly placed 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); if (Block == E_BLOCK_AIR) @@ -65,7 +70,7 @@ public: { "BurningSkull" } }; - cPainting * Painting = new cPainting(gPaintingTitlesList[a_World->GetTickRandomNumber(ARRAYCOUNT(gPaintingTitlesList) - 1)].Title, a_Dir, a_BlockX, a_BlockY, a_BlockZ); + cPainting * Painting = new cPainting(gPaintingTitlesList[a_World->GetTickRandomNumber(ARRAYCOUNT(gPaintingTitlesList) - 1)].Title, a_BlockFace, a_BlockX, a_BlockY, a_BlockZ); Painting->Initialize(*a_World); if (!a_Player->IsGameModeCreative()) |