AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

fixed bad web merge

Browse Source
This commit is contained in:
Marc Lorenz 2021-12-21 13:21:58 +01:00 committed by Alexander Harkness
parent 00dbbabc5c
commit c741d81017
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Entities/Pickup.cpp
View File

@ -47,6 +47,9 @@ public:
{ {
short CombineCount = static_cast<short>(Item.m_ItemCount); short CombineCount = static_cast<short>(Item.m_ItemCount);
if ((CombineCount + static_cast<short>(m_Pickup->GetItem().m_ItemCount)) > static_cast<short>(Item.GetMaxStackSize())) if ((CombineCount + static_cast<short>(m_Pickup->GetItem().m_ItemCount)) > static_cast<short>(Item.GetMaxStackSize()))
{
CombineCount = Item.GetMaxStackSize() - m_Pickup->GetItem().m_ItemCount;
}
if (CombineCount <= 0) if (CombineCount <= 0)
{ {