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

fix #K4006 - 'null obj after quiver merge' panic

Browse Source 
Using apply to unlight a lit potion of oil makes it unlit, removes
it from inventory, and then re-adds it to try to force it to merge
with other potions of oil.  If it was wielded and the other potions
were quivered, the game would panic.  When merging, they get forced
into the weapon slot in preference to the quiver slot.

Unwearing it before freeinv+addinv would solve this but also leave
the hero with nothing wielded, even if it didn't merge with another
stack.  Instead, don't try to merge if the potion being unlit happens
to be worn.

3.6.x was subject to this too and the fix is small+isolated but the
situation is so uncommon that I haven't bothered backporting it.

Applying a lump of royal jelly and then not picking anything to rub
it on had a similar problem.  It also panicked if the applied lump
was wielded and other lumps were quivered.  The fix is different
because the stack it gets split from during apply is known.  This one
doesn't impact 3.6.x; applying jelly to eggs wasn't implemented yet.
This commit is contained in:
PatR
2023-09-19 07:16:00 -07:00
parent 44a649b0b4
commit 3fdcd5f4e0
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/fixes3-7-0.txt
View File

@@ -1237,6 +1237,9 @@ ring of hunger prevents choking on your food
paranoid_confirm:pray can be changed to require yes/no response instead of y/n
by also setting paranoid_confirm:Confirm
wand of probing reveals map locations in the ray path
applying a wielded, lit potion of oil to unlight it while other unlit
potion(s) of oil were quivered would trigger panic
"addinv: null obj after quiver merge otyp=N" where N is POT_OIL
Fixes to 3.7.0-x General Problems Exposed Via git Repository
@@ -1676,6 +1679,9 @@ using wizard mode #wizkill outside the endgame followed by m^V to enter the
dwarf/elf/orc/gnome hero killed by zombie would rise as human zombie for bones
paranoid_confirm:Autoall for menustyle:full has the test handling backward and
was treating 'yes' as no and 'n' or ESC as 'y'
applying a wielded lump of royal jelly but not picking something to rub it on
while other lumps of jelly were quivered would trigger a panic,
"addinv: null obj after quiver merge" (like applying lit potion of oil)
Fixes to 3.7.0-x Platform and/or Interface Problems Exposed Via git Repository