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

fixed possible 64+64 error

Browse Source
This commit is contained in:
Marc Lorenz 2021-12-21 12:45:05 +01:00 committed by Alexander Harkness
parent 5fa68ea807
commit 00dbbabc5c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Entities/Pickup.cpp
View File

@ -45,11 +45,8 @@ public:
cItem & Item = OtherPickup.GetItem(); cItem & Item = OtherPickup.GetItem();
if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem()) && OtherPickup.CanCombine()) if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem()) && OtherPickup.CanCombine())
{ {
char CombineCount = Item.m_ItemCount; short CombineCount = static_cast<short>(Item.m_ItemCount);
if ((CombineCount + m_Pickup->GetItem().m_ItemCount) > 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)
{ {