condtests[bl_bareh] requires a couple of additional g.context.botl = 1

This commit is contained in:
nhmall
2020-02-08 11:03:46 -05:00
parent d02bf5d1d0
commit ffd9eedb2c
3 changed files with 7 additions and 0 deletions
+2
View File
@@ -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 prevent "you materialize on a different level" after "a mysterious force
prevents you from descending" if you try to level teleport past the prevents you from descending" if you try to level teleport past the
stairs down from the quest home level before being granted access 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 Platform- and/or Interface-Specific Fixes
+2
View File
@@ -593,6 +593,8 @@ Gloves_off(VOID_ARGS)
engage if a corpse has been set up as the alternate weapon.] */ engage if a corpse has been set up as the alternate weapon.] */
if (u.twoweap && uswapwep && uswapwep->otyp == CORPSE) if (u.twoweap && uswapwep && uswapwep->otyp == CORPSE)
wielding_corpse(uswapwep, on_purpose); wielding_corpse(uswapwep, on_purpose);
if (condtests[bl_bareh].enabled)
g.context.botl = 1;
return 0; return 0;
} }
+3
View File
@@ -139,6 +139,7 @@ struct obj *wep;
{ {
/* Separated function so swapping works easily */ /* Separated function so swapping works easily */
int res = 0; int res = 0;
boolean had_wep = (uwep != 0);
if (!wep) { if (!wep) {
/* No weapon */ /* No weapon */
@@ -221,6 +222,8 @@ struct obj *wep;
} }
} }
} }
if ((had_wep != (uwep != 0)) && condtests[bl_bareh].enabled)
g.context.botl = 1;
return res; return res;
} }