From ffd9eedb2c0d07114b57c0fb04694e85877787a5 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 8 Feb 2020 11:03:46 -0500 Subject: [PATCH] condtests[bl_bareh] requires a couple of additional g.context.botl = 1 --- doc/fixes37.0 | 2 ++ src/do_wear.c | 2 ++ src/wield.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 4454b3eee..09d6858ea 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -87,6 +87,8 @@ creating Mine Town variant 1 (Orcish Town) sometimes complained about being prevent "you materialize on a different level" after "a mysterious force prevents you from descending" if you try to level teleport past the stairs down from the quest home level before being granted access +set g.context.botl for glove and wielding actions that could start or end + bare-handedness in support of condtests[bl_bareh] Platform- and/or Interface-Specific Fixes diff --git a/src/do_wear.c b/src/do_wear.c index 663cb6947..882294818 100644 --- a/src/do_wear.c +++ b/src/do_wear.c @@ -593,6 +593,8 @@ Gloves_off(VOID_ARGS) engage if a corpse has been set up as the alternate weapon.] */ if (u.twoweap && uswapwep && uswapwep->otyp == CORPSE) wielding_corpse(uswapwep, on_purpose); + if (condtests[bl_bareh].enabled) + g.context.botl = 1; return 0; } diff --git a/src/wield.c b/src/wield.c index c99ee9c7b..6e58f682f 100644 --- a/src/wield.c +++ b/src/wield.c @@ -139,6 +139,7 @@ struct obj *wep; { /* Separated function so swapping works easily */ int res = 0; + boolean had_wep = (uwep != 0); if (!wep) { /* No weapon */ @@ -221,6 +222,8 @@ struct obj *wep; } } } + if ((had_wep != (uwep != 0)) && condtests[bl_bareh].enabled) + g.context.botl = 1; return res; } -- 2.50.1