git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2245 c06c8d41-db1a-0410-9941-cceddc491573
627QATWYWAYCCD3YFK2ZTFC2BPQF5DYFDLCTV6ULH53UVJOA265AC
BFZZ7DFLZM4WNHQOKWDJENZOLMXH3UPHZ437BMISYJ3VSO2Y57WQC
GDHH6O4KVTDWSENR573WKVFCRM2L4AVOBRSVPI6F5A2UR7U7SPXAC
SDLKLUNFGVKDS55DDJZCBAVIB7NL3RRYPTACAY65SCUQKV6APFSAC
CIPVRZGLOZHCERK6YPOBV3P2E4IAB4H6D5EHLRQE2O5E4P4VCBUAC
BWAQ3FHBBM6G3K3KYP75CRTR343RDQZJRYX5ZGYUEXYBAC3APDLAC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
if (items_stack(i, items[j].thing))
{
items[j].thing.quantity += i.quantity;
items[j].name = items[j].thing.name(DESC_NOCAP_A);
return;
}
items[j].thing.quantity = orig_quantity + i.quantity;
items[j].name =
items[j].thing.name(DESC_NOCAP_A, false, false, true,
!is_stackable_item(i));
return;