evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blah

Browse Source
This commit is contained in:
Kae 2023-08-19 12:15:22 +10:00
parent 156c243360
commit d53379f6c2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/game/StarPlayer.cpp
View File

@ -1143,7 +1143,7 @@ PlayerInventoryPtr Player::inventory() const {
return m_inventory; return m_inventory;
} }
size_t Player::itemsCanHold(ItemPtr const& items) const { uint64_t Player::itemsCanHold(ItemPtr const& items) const {
return m_inventory->itemsCanFit(items); return m_inventory->itemsCanFit(items);
} }
@ -1211,7 +1211,7 @@ bool Player::hasItem(ItemDescriptor const& descriptor, bool exactMatch) const {
return m_inventory->hasItem(descriptor, exactMatch); return m_inventory->hasItem(descriptor, exactMatch);
} }
size_t Player::hasCountOfItem(ItemDescriptor const& descriptor, bool exactMatch) const { uint64_t Player::hasCountOfItem(ItemDescriptor const& descriptor, bool exactMatch) const {
return m_inventory->hasCountOfItem(descriptor, exactMatch); return m_inventory->hasCountOfItem(descriptor, exactMatch);
} }

4
source/game/StarPlayer.hpp
View File

@ -198,7 +198,7 @@ public:
PlayerInventoryPtr inventory() const; PlayerInventoryPtr inventory() const;
// Returns the number of items from this stack that could be // Returns the number of items from this stack that could be
// picked up from the world, using inventory tab filtering // picked up from the world, using inventory tab filtering
size_t itemsCanHold(ItemPtr const& items) const; uint64_t itemsCanHold(ItemPtr const& items) const;
// Adds items to the inventory, returning the overflow. // Adds items to the inventory, returning the overflow.
// The items parameter is invalid after use. // The items parameter is invalid after use.
ItemPtr pickupItems(ItemPtr const& items); ItemPtr pickupItems(ItemPtr const& items);
@ -209,7 +209,7 @@ public:
void triggerPickupEvents(ItemPtr const& item); void triggerPickupEvents(ItemPtr const& item);
bool hasItem(ItemDescriptor const& descriptor, bool exactMatch = false) const; bool hasItem(ItemDescriptor const& descriptor, bool exactMatch = false) const;
size_t hasCountOfItem(ItemDescriptor const& descriptor, bool exactMatch = false) const; uint64_t hasCountOfItem(ItemDescriptor const& descriptor, bool exactMatch = false) const;
// altough multiple entries may match, they might have different // altough multiple entries may match, they might have different
// serializations // serializations
ItemDescriptor takeItem(ItemDescriptor const& descriptor, bool consumePartial = false, bool exactMatch = false); ItemDescriptor takeItem(ItemDescriptor const& descriptor, bool consumePartial = false, bool exactMatch = false);