Fix pickup combining over the maximum stack size.

Fix #1114
But m_Pickup->GetItem().m_ItemCount has the char type, too.