summaryrefslogtreecommitdiffstats
path: root/source/UI
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-19 20:22:37 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-05-19 20:22:37 +0200
commit90c398a3926f097e51955817e2829d831ae2bd2b (patch)
treeaf4e2d236a5e0595f19975dcd2295c60c4a59712 /source/UI
parentDebuggers: sorted things into separate functions, commented out most of them; added ForEachEntity() testing - list all and kill all entities. (diff)
downloadcuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar
cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.gz
cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.bz2
cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.lz
cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.xz
cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.tar.zst
cuberite-90c398a3926f097e51955817e2829d831ae2bd2b.zip
Diffstat (limited to 'source/UI')
-rw-r--r--source/UI/SlotArea.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp
index f78e23e99..7c7b8cd4a 100644
--- a/source/UI/SlotArea.cpp
+++ b/source/UI/SlotArea.cpp
@@ -614,7 +614,7 @@ void cSlotAreaInventoryBase::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAc
const cItem * cSlotAreaInventoryBase::GetSlot(int a_SlotNum, cPlayer & a_Player)
{
// a_SlotNum ranges from 0 to 35, map that to the player's inventory slots 9 to 44
- return a_Player.GetInventory().GetSlot(a_SlotNum + m_SlotOffset);
+ return &a_Player.GetInventory().GetSlot(a_SlotNum + m_SlotOffset);
}
@@ -623,7 +623,7 @@ const cItem * cSlotAreaInventoryBase::GetSlot(int a_SlotNum, cPlayer & a_Player)
void cSlotAreaInventoryBase::SetSlot(int a_SlotNum, cPlayer & a_Player, const cItem & a_Item)
{
- *(a_Player.GetInventory().GetSlot(a_SlotNum + m_SlotOffset)) = a_Item;
+ a_Player.GetInventory().SetSlot(a_SlotNum + m_SlotOffset, a_Item);
}