diff --git a/.travis.yml b/.travis.yml index 818b1bf5a..e2c522f80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,6 +108,6 @@ sudo: false notifications: email: recipients: -# - devteam@nethack.org + - devteam@nethack.org diff --git a/doc/fixes36.3 b/doc/fixes36.3 index d03090095..261215b97 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.79 $ $NHDT-Date: 1561917056 2019/06/30 17:50:56 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.80 $ $NHDT-Date: 1561920590 2019/06/30 18:49:50 $ This fixes36.3 file is here to capture information about updates in the 3.6.x lineage following the release of 3.6.2 in May 2019. Please note, however, @@ -177,6 +177,8 @@ curses+'perm_invent': don't highlight inventory letters since nothing is selectable from the menu comprising the persistent inventory window curses+'popup_dialog': show the text cursor at the end of prompts for single character input +curses+DUMPLOG: pass along old messages from save file and quest message + summaries to dumplog message history curses+EDIT_GETLIN: when a prompt's answer was preloaded, using ESC to discard it deleted it from the answer buffer but didn't erase it from screen curses+EDIT_GETLIN: the preceding fix handled an answer which spanned more diff --git a/src/zap.c b/src/zap.c index 60bcee3a7..af386bde2 100644 --- a/src/zap.c +++ b/src/zap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 zap.c $NHDT-Date: 1559994626 2019/06/08 11:50:26 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.311 $ */ +/* NetHack 3.6 zap.c $NHDT-Date: 1561927499 2019/06/30 20:44:59 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.312 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -4107,7 +4107,7 @@ boolean say; /* Announce out of sight hit/miss events if true */ break; if (type >= 0) mon->mstrategy &= ~STRAT_WAITMASK; - buzzmonst: + buzzmonst: g.notonhead = (mon->mx != g.bhitpos.x || mon->my != g.bhitpos.y); if (zap_hit(find_mac(mon), spell_type)) { if (mon_reflects(mon, (char *) 0)) { @@ -4227,7 +4227,7 @@ boolean say; /* Announce out of sight hit/miss events if true */ uchar rmn; boolean fireball; - make_bounce: + make_bounce: bchance = (levl[sx][sy].typ == STONE) ? 10 : (In_mines(&u.uz) && IS_WALL(levl[sx][sy].typ)) ? 20 : 75; @@ -4630,7 +4630,7 @@ short exploding_wand_typ; hear_txt = "crackling."; break; default: - def_case: + def_case: if (exploding_wand_typ > 0) { /* Magical explosion from misc exploding wand */ if (exploding_wand_typ == WAN_STRIKING) { @@ -5274,7 +5274,7 @@ makewish() nothing = cg.zeroobj; /* lint suppression; only its address matters */ if (flags.verbose) You("may wish for an object."); -retry: + retry: Strcpy(promptbuf, "For what do you wish"); if (iflags.cmdassist && tries > 0) Strcat(promptbuf, " (enter 'help' for assistance)"); @@ -5285,6 +5285,7 @@ retry: buf[0] = '\0'; } else if (!strcmpi(buf, "help")) { wishcmdassist(MAXWISHTRY - tries); + buf[0] = '\0'; /* for EDIT_GETLIN */ goto retry; } /* diff --git a/win/curses/cursmesg.c b/win/curses/cursmesg.c index 0e67787a0..95d56ae4d 100644 --- a/win/curses/cursmesg.c +++ b/win/curses/cursmesg.c @@ -886,6 +886,9 @@ boolean restoring_msghist; static boolean initd = FALSE; static int stash_count; static nhprev_mesg *stash_head = 0; +#ifdef DUMPLOG + extern unsigned saved_pline_index; /* pline.c */ +#endif if (restoring_msghist && !initd) { /* hide any messages we've gathered since starting current session @@ -895,12 +898,19 @@ boolean restoring_msghist; stash_head = first_mesg, first_mesg = (nhprev_mesg *) 0; last_mesg = (nhprev_mesg *) 0; /* no need to remember the tail */ initd = TRUE; +#ifdef DUMPLOG + /* this suffices; there's no need to scrub saved_pline[] pointers */ + saved_pline_index = 0; +#endif } if (msg) { mesg_add_line(msg); /* treat all saved and restored messages as turn #1 */ last_mesg->turn = 1L; +#ifdef DUMPLOG + dumplogmsg(last_mesg->str); +#endif } else if (stash_count) { nhprev_mesg *mesg; long mesg_turn; @@ -920,6 +930,9 @@ boolean restoring_msghist; mesg_add_line(mesg->str); /* added line became new tail */ last_mesg->turn = mesg_turn; +#ifdef DUMPLOG + dumplogmsg(mesg->str); +#endif free((genericptr_t) mesg->str); free((genericptr_t) mesg); }