From: PatR Date: Mon, 16 Mar 2020 09:19:28 +0000 (-0700) Subject: botl fixes X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6a282ec99983a4222e66fe128831a72b9370a76;p=nethack botl fixes Add a couple of missing status updates. --- diff --git a/src/botl.c b/src/botl.c index 3b29e348b..5fcfca6d8 100644 --- a/src/botl.c +++ b/src/botl.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 botl.c $NHDT-Date: 1583190980 2020/03/02 23:16:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.185 $ */ +/* NetHack 3.6 botl.c $NHDT-Date: 1584350350 2020/03/16 09:19:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.186 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1117,10 +1117,11 @@ cond_menu(VOID_ARGS) } while (showmenu); if (res > 0) { - for (i = 0; i < CONDITION_COUNT; ++i) { - if (condtests[i].enabled != condtests[i].choice) + for (i = 0; i < CONDITION_COUNT; ++i) + if (condtests[i].enabled != condtests[i].choice) { condtests[i].enabled = condtests[i].choice; - } + g.context.botl = TRUE; + } } } diff --git a/src/dig.c b/src/dig.c index 7f08ce170..9579b66b7 100644 --- a/src/dig.c +++ b/src/dig.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 dig.c $NHDT-Date: 1578659784 2020/01/10 12:36:24 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.135 $ */ +/* NetHack 3.6 dig.c $NHDT-Date: 1584350347 2020/03/16 09:19:07 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.138 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1827,8 +1827,7 @@ boolean *dealloced; *dealloced = FALSE; if (otmp == uball) { unpunish(); - u.utrap = rn1(50, 20); - u.utraptype = TT_BURIEDBALL; + set_utrap((unsigned) rn1(50, 20), TT_BURIEDBALL); pline_The("iron ball gets buried!"); } /* after unpunish(), or might get deallocated chain */ diff --git a/src/options.c b/src/options.c index e4532de29..4570bcf1f 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 options.c $NHDT-Date: 1583282760 2020/03/04 00:46:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.457 $ */ +/* NetHack 3.7 options.c $NHDT-Date: 1584350350 2020/03/16 09:19:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.459 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2008. */ /* NetHack may be freely redistributed. See license for details. */ @@ -7568,6 +7568,8 @@ doset() /* changing options via menu by Per Liboriussen */ check_gold_symbol(); reglyph_darkroom(); (void) doredraw(); + } else if (g.context.botl || g.context.botlx) { + bot(); } return 0; }