Clear thrownobj when punished and swallowed

As per Pat's suggestion, this actually does work correctly;
I have no idea why I thought it didn't ...
This commit is contained in:
Pasi Kallinen
2015-11-13 00:07:43 +02:00
parent 489d56d4bb
commit 4387bde968

View File

@@ -1161,10 +1161,9 @@ boolean
; /* missile has already been handled */ ; /* missile has already been handled */
} else if (u.uswallow) { } else if (u.uswallow) {
/* ball is not picked up by monster */ /* ball is not picked up by monster */
if (obj != uball) { if (obj != uball)
(void) mpickobj(u.ustuck, obj); (void) mpickobj(u.ustuck, obj);
thrownobj = (struct obj *) 0; thrownobj = (struct obj *) 0;
}
} else { } else {
/* the code following might become part of dropy() */ /* the code following might become part of dropy() */
if (obj->oartifact == ART_MJOLLNIR && Role_if(PM_VALKYRIE) if (obj->oartifact == ART_MJOLLNIR && Role_if(PM_VALKYRIE)