From 02b9368dbaab631466fcb3f5aba5c1691cc15aa7 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Fri, 11 Oct 2019 20:00:17 +0300 Subject: [PATCH] Fix fired iron ball sanity error When hero was punished and swallowed, and fired the attached iron ball from a quiver, thrownobj was not cleared. --- doc/fixes36.3 | 1 + src/dothrow.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/fixes36.3 b/doc/fixes36.3 index 49c49674c..c62dfc1d1 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -178,6 +178,7 @@ avoid 'object lost' panic when polymorph causes loss of levitation boots or wasn't possible to tell where they were, unlike all other forms of multiple movement; stop running if/when an engraving is reached fix exploding land mine moving ball or chain and causing a sanity error +fix firing attached iron ball when swallowed causing a sanity error Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository diff --git a/src/dothrow.c b/src/dothrow.c index a2d12c93a..1b2a80184 100644 --- a/src/dothrow.c +++ b/src/dothrow.c @@ -1294,7 +1294,7 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */ || !index(in_rooms(mon->mx, mon->my, SHOPBASE), *u.ushops))) hot_pursuit(mon); - if (obj_gone) + if (obj_gone || obj == uball) thrownobj = (struct obj *) 0; }