From f4faab3f73dd7de50c7742dc873764283f846063 Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Tue, 19 Dec 2006 05:24:59 +0000 Subject: [PATCH] enchant weapon fix (trunk only) Noticed while testing crysknives; a post-3.4.3 change (not present in the branch code) introduced a bug that prevented scrolls of enchant weapon from being used up properly when read. --- src/read.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/read.c b/src/read.c index ae95f9938..25b86ea51 100644 --- a/src/read.c +++ b/src/read.c @@ -166,9 +166,9 @@ doread() else if (!objects[scroll->otyp].oc_uname) docall(scroll); } + scroll->in_use = FALSE; if(scroll->otyp != SCR_BLANK_PAPER) useup(scroll); - else scroll->in_use = FALSE; } return(1); } @@ -1078,10 +1078,10 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */ uwep->oerodeproof = new_erodeproof ? 1 : 0; break; } - if (chwepon(sobj, - scursed ? -1 : !uwep ? 1 : - (uwep->spe >= 9) ? !rn2(uwep->spe) : - sblessed ? rnd(3 - uwep->spe / 3) : 1)) + if (!chwepon(sobj, + scursed ? -1 : !uwep ? 1 : + (uwep->spe >= 9) ? !rn2(uwep->spe) : + sblessed ? rnd(3 - uwep->spe / 3) : 1)) sobj = 0; /* nothing enchanted: strange_feeling -> useup */ break; case SCR_TAMING: