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

held artifacts evading your grasp (trunk only)

Browse Source 
From a bug report, trying
to invoke a wielded artifact after changing alignment resulted in "the
<artifact> evades your grasp" but it remained wielded, contradicting the
message.  This adjusts the message in touch_artifact() if the object is
already in inventory, and adds retouch_object() to handle cases where
failing to be able to touch ought to force unwearing/unwielding.
This commit is contained in:
nethack.rankin
2007-03-10 05:54:17 +00:00
parent b8a51d3649
commit f67a4547ac
7 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/eat.c
View File

@@ -1152,11 +1152,9 @@ register int pm;
break;
}
if (catch_lycanthropy && defends(AD_WERE, uwep)) {
if (!touch_artifact(uwep, &youmonst)) {
dropx(uwep);
uwepgone();
}
if (catch_lycanthropy) {
if (u.twoweap) (void)retouch_object(&uswapwep, TRUE);
if (uwep) (void)retouch_object(&uwep, TRUE);
}
return;
@@ -2250,7 +2248,7 @@ struct obj *otmp;
int
doeat() /* generic "eat" command funtion (see cmd.c) */
{
register struct obj *otmp;
struct obj *otmp;
int basenutrit; /* nutrition of full item */
boolean dont_start = FALSE, nodelicious = FALSE;
@@ -2276,7 +2274,8 @@ doeat() /* generic "eat" command funtion (see cmd.c) */
* mails, players who polymorph back to human in the middle of their
* metallic meal, etc....
*/
if (otmp->oartifact && !touch_artifact(otmp, &youmonst)) {
if (!(carried(otmp) ? retouch_object(&otmp, FALSE) :
touch_artifact(otmp, &youmonst))) {
return 1;
} else if (!is_edible(otmp)) {
You("cannot eat that!");