From 42a6a5df6614ab3951f1f6bb49763e77cd8babd9 Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Sun, 31 Dec 2023 17:41:00 +0200 Subject: [PATCH] Cursed welded quarterstaff doesn't prevent spellcasting --- doc/fixes3-7-0.txt | 1 + src/spell.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index f6e5969a9..2c009eac6 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -1338,6 +1338,7 @@ amulet of unchanging cannot be polymorphed wishing for a "lit candle" provided one, but the feedback as it was added into invent was "partly used candle (lit)" because of how 'lit' timer works don't fall off steed because of Fumbling if saddle is cursed +cursed welded quarterstaff doesn't prevent spellcasting Fixes to 3.7.0-x General Problems Exposed Via git Repository diff --git a/src/spell.c b/src/spell.c index 1bed24fa3..f09a86326 100644 --- a/src/spell.c +++ b/src/spell.c @@ -673,7 +673,7 @@ rejectcasting(void) } else if (!can_chant(&gy.youmonst)) { You("are unable to chant the incantation."); return TRUE; - } else if (!freehand()) { + } else if (!freehand() && !(uwep && uwep->otyp == QUARTERSTAFF)) { /* Note: !freehand() occurs when weapon and shield (or two-handed * weapon) are welded to hands, so "arms" probably doesn't need * to be makeplural(bodypart(ARM)).