fix recent bypass of obj placement

This commit is contained in:
nhmall
2019-10-22 09:40:10 -04:00
parent 5690cce584
commit 15d5942b2a

View File

@@ -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 || obj == uball)
if (obj_gone)
thrownobj = (struct obj *) 0;
}
@@ -1306,6 +1306,8 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
swallowit:
if (obj != uball)
(void) mpickobj(u.ustuck, obj); /* clears 'thrownobj' */
else
clear_thrownobj = TRUE;
goto throwit_return;
} else {
/* Mjollnir must we wielded to be thrown--caller verifies this;