flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed a comment and changed CombineCount to short.

Browse Source
This commit is contained in:
Howaner 2014-06-26 17:20:48 +02:00
parent 9b7f1e3db8
commit cba273dc7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/Pickup.cpp
View File

@ -41,7 +41,7 @@ public:
cItem & Item = ((cPickup *)a_Entity)->GetItem(); cItem & Item = ((cPickup *)a_Entity)->GetItem();
if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem())) if ((Distance < 1.2) && Item.IsEqual(m_Pickup->GetItem()))
{ {
char CombineCount = Item.m_ItemCount; short CombineCount = Item.m_ItemCount;
if ((CombineCount + m_Pickup->GetItem().m_ItemCount) > Item.GetMaxStackSize()) if ((CombineCount + m_Pickup->GetItem().m_ItemCount) > Item.GetMaxStackSize())
{ {
CombineCount = Item.GetMaxStackSize() - m_Pickup->GetItem().m_ItemCount; CombineCount = Item.GetMaxStackSize() - m_Pickup->GetItem().m_ItemCount;
@ -150,7 +150,7 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk)
} }
} }
if (!IsDestroyed() && (m_Item.m_ItemCount < m_Item.GetMaxStackSize())) // Don't try to combine if someone has tried to combine me if (!IsDestroyed() && (m_Item.m_ItemCount < m_Item.GetMaxStackSize())) // Don't combine into an already full pickup
{ {
cPickupCombiningCallback PickupCombiningCallback(GetPosition(), this); cPickupCombiningCallback PickupCombiningCallback(GetPosition(), this);
m_World->ForEachEntity(PickupCombiningCallback); // Not ForEachEntityInChunk, otherwise pickups don't combine across chunk boundaries m_World->ForEachEntity(PickupCombiningCallback); // Not ForEachEntityInChunk, otherwise pickups don't combine across chunk boundaries