nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Don't merge stacks w/ different was_thrown/dropped

Browse Source 
Previously, if you threw a dagger into a pile of daggers, you'd pick up
the entire pile with pickup_thrown on.  Since pickup_thrown and
dropped_nopick options are supposed to apply specifically to items
you've handled, don't merge items with different values in those fields.
This commit is contained in:
Michael Meyer
2023-11-17 08:49:14 -05:00
committed by PatR
parent c07d114644
commit ecda85cc32
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/invent.c
View File

@@ -4822,7 +4822,9 @@ mergable(
if (obj->unpaid != otmp->unpaid || obj->spe != otmp->spe
|| obj->no_charge != otmp->no_charge || obj->obroken != otmp->obroken
|| obj->otrapped != otmp->otrapped || obj->lamplit != otmp->lamplit)
|| obj->otrapped != otmp->otrapped || obj->lamplit != otmp->lamplit
|| obj->was_thrown != otmp->was_thrown
|| obj->was_dropped != otmp->was_dropped)
return FALSE;
if (obj->oclass == FOOD_CLASS