diff options
Diffstat (limited to 'src/Items/ItemEmptyMap.h')
| -rw-r--r-- | src/Items/ItemEmptyMap.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/Items/ItemEmptyMap.h b/src/Items/ItemEmptyMap.h index fe7b03e23..ac5053107 100644 --- a/src/Items/ItemEmptyMap.h +++ b/src/Items/ItemEmptyMap.h @@ -23,15 +23,19 @@ public: + + 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 + cWorld * a_World, + cPlayer * a_Player, + cBlockPluginInterface & a_PluginInterface, + const cItem & a_HeldItem, + const Vector3i a_ClickedBlockPos, + eBlockFace a_ClickedBlockFace ) override { - UNUSED(a_Item); - UNUSED(a_BlockX); - UNUSED(a_BlockZ); - UNUSED(a_BlockFace); + UNUSED(a_HeldItem); + UNUSED(a_ClickedBlockFace); // The map center is fixed at the central point of the 8x8 block of chunks you are standing in when you right-click it. @@ -40,22 +44,14 @@ public: int CenterX = FloorC(a_Player->GetPosX() / RegionWidth) * RegionWidth + (RegionWidth / 2); int CenterZ = FloorC(a_Player->GetPosZ() / RegionWidth) * RegionWidth + (RegionWidth / 2); - cMap * NewMap = a_World->GetMapManager().CreateMap(CenterX, CenterZ, DEFAULT_SCALE); - - // Remove empty map from inventory - if (!a_Player->GetInventory().RemoveOneEquippedItem()) - { - ASSERT(!"Inventory mismatch"); - return true; - } - + auto NewMap = a_World->GetMapManager().CreateMap(CenterX, CenterZ, DEFAULT_SCALE); if (NewMap == nullptr) { return true; } - a_Player->GetInventory().AddItem(cItem(E_ITEM_MAP, 1, static_cast<short>(NewMap->GetID() & 0x7fff))); - + // Replace map in the inventory: + a_Player->ReplaceOneEquippedItemTossRest(cItem(E_ITEM_MAP, 1, static_cast<short>(NewMap->GetID() & 0x7fff))); return true; } } ; |