Merge branch 'NetHack-3.6'

2019-10-17 20:52:10 -04:00
parent 72fcfadf23 389c496055
commit 3ccc6e5308
19 changed files with 742 additions and 473 deletions
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -1292,7 +1292,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)
            g.thrownobj = (struct obj *) 0;
    }