diff options
author | Howaner <franzi.moos@googlemail.com> | 2015-03-10 19:40:53 +0100 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2015-03-10 19:40:53 +0100 |
commit | 685f6e37138dc63391bfa587f6631fa303dcbe6b (patch) | |
tree | 3e0e7313c88c27d5f4a8d48f8959f3cc04b94486 /src/UI/InventoryWindow.h | |
parent | Merge branch 'master' into Inventory (diff) | |
download | cuberite-685f6e37138dc63391bfa587f6631fa303dcbe6b.tar cuberite-685f6e37138dc63391bfa587f6631fa303dcbe6b.tar.gz cuberite-685f6e37138dc63391bfa587f6631fa303dcbe6b.tar.bz2 cuberite-685f6e37138dc63391bfa587f6631fa303dcbe6b.tar.lz cuberite-685f6e37138dc63391bfa587f6631fa303dcbe6b.tar.xz cuberite-685f6e37138dc63391bfa587f6631fa303dcbe6b.tar.zst cuberite-685f6e37138dc63391bfa587f6631fa303dcbe6b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/UI/InventoryWindow.h | 56 |
1 files changed, 3 insertions, 53 deletions
diff --git a/src/UI/InventoryWindow.h b/src/UI/InventoryWindow.h index 31b85b1bc..10952d37f 100644 --- a/src/UI/InventoryWindow.h +++ b/src/UI/InventoryWindow.h @@ -21,59 +21,9 @@ class cInventoryWindow : typedef cWindow super; public: - cInventoryWindow(cPlayer & a_Player) : - cWindow(wtInventory, "Inventory"), - m_Player(a_Player) - { - m_SlotAreas.push_back(new cSlotAreaCrafting(2, *this)); // The creative inventory doesn't display it, but it's still counted into slot numbers - m_SlotAreas.push_back(new cSlotAreaArmor(*this)); - m_SlotAreas.push_back(new cSlotAreaInventory(*this)); - m_SlotAreas.push_back(new cSlotAreaHotBar(*this)); - } - - - virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override - { - cSlotAreas AreasInOrder; - - if (a_ClickedArea == m_SlotAreas[0]) - { - // Crafting Area - if (a_Slot == 0) - { - // Result Slot - AreasInOrder.push_back(m_SlotAreas[3]); /* Hotbar */ - AreasInOrder.push_back(m_SlotAreas[2]); /* Inventory */ - } - else - { - AreasInOrder.push_back(m_SlotAreas[2]); /* Inventory */ - AreasInOrder.push_back(m_SlotAreas[3]); /* Hotbar */ - } - super::DistributeStackToAreas(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, (a_Slot == 0)); - } - else if (a_ClickedArea == m_SlotAreas[1]) - { - // Armor Area - AreasInOrder.push_back(m_SlotAreas[2]); /* Inventory */ - AreasInOrder.push_back(m_SlotAreas[3]); /* Hotbar */ - super::DistributeStackToAreas(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false); - } - else if (a_ClickedArea == m_SlotAreas[2]) - { - // Inventory Area - AreasInOrder.push_back(m_SlotAreas[1]); /* Armor */ - AreasInOrder.push_back(m_SlotAreas[3]); /* Hotbar */ - super::DistributeStackToAreas(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false); - } - else - { - // Hotbar - AreasInOrder.push_back(m_SlotAreas[1]); /* Armor */ - AreasInOrder.push_back(m_SlotAreas[2]); /* Inventory */ - super::DistributeStackToAreas(a_ItemStack, a_Player, AreasInOrder, a_ShouldApply, false); - } - } + cInventoryWindow(cPlayer & a_Player); + + virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override; protected: cPlayer & m_Player; |