diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-07-26 23:24:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-26 23:24:36 +0200 |
commit | 950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3 (patch) | |
tree | 5e6fde4625714922e970bd5ad4ea339f58ab6b57 /src/UI | |
parent | At long last... Piston animations! (diff) | |
download | cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.gz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.bz2 cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.lz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.xz cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.zst cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.zip |
Diffstat (limited to 'src/UI')
-rw-r--r-- | src/UI/EnchantingWindow.cpp | 1 | ||||
-rw-r--r-- | src/UI/SlotArea.cpp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/UI/EnchantingWindow.cpp b/src/UI/EnchantingWindow.cpp index 4c5bcbfd5..5ac75a2da 100644 --- a/src/UI/EnchantingWindow.cpp +++ b/src/UI/EnchantingWindow.cpp @@ -44,7 +44,6 @@ void cEnchantingWindow::SetProperty(short a_Property, short a_Value, cPlayer & a - void cEnchantingWindow::SetProperty(short a_Property, short a_Value) { if ((a_Property < 0) || (static_cast<size_t>(a_Property) >= ARRAYCOUNT(m_PropertyValue))) diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp index b43da1162..d6b870d0e 100644 --- a/src/UI/SlotArea.cpp +++ b/src/UI/SlotArea.cpp @@ -587,7 +587,6 @@ void cSlotAreaCrafting::OnPlayerRemoved(cPlayer & a_Player) - void cSlotAreaCrafting::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item) { // Update the recipe after setting the slot, if the slot is not the result slot: @@ -614,6 +613,7 @@ void cSlotAreaCrafting::DistributeStack(cItem & a_ItemStack, cPlayer & a_Player, + void cSlotAreaCrafting::ClickedResult(cPlayer & a_Player) { cItem & DraggingItem = a_Player.GetDraggingItem(); @@ -757,6 +757,7 @@ cCraftingRecipe & cSlotAreaCrafting::GetRecipeForPlayer(cPlayer & a_Player) + void cSlotAreaCrafting::HandleCraftItem(const cItem & a_Result, cPlayer & a_Player) { switch (a_Result.m_ItemType) @@ -1225,6 +1226,7 @@ cSlotAreaBeacon::~cSlotAreaBeacon() + bool cSlotAreaBeacon::IsPlaceableItem(short a_ItemType) { switch (a_ItemType) @@ -2191,6 +2193,9 @@ void cSlotAreaBrewingstand::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) } + + + //////////////////////////////////////////////////////////////////////////////// // cSlotAreaMinecartWithChest: |