nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more message history

Browse Source 
Noticed while investigating the issue with DECgraphics characters in
msg_window:full/combination/reverse output for tty which got fixed
by the previous commit.  There was a discrepancy in DUMPLOG because
the pager code bypasses pline() in order to use putmixed().  tty
puts strings from the latter into ^P recall history (although they'll
only render correctly if nothing after the first character needs
special handling), but nothing was putting that same info into
DUMPLOG.  This fix is pretty clumsy but eliminates the discrepancy.
This commit is contained in:
PatR
2019-02-04 18:40:55 -08:00
parent a8a187f89b
commit 423cf77a37
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/fixes36.2
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.248 $ $NHDT-Date: 1549333449 2019/02/05 02:24:09 $
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.249 $ $NHDT-Date: 1549334449 2019/02/05 02:40:49 $
This fixes36.2 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.1 in April 2018. Please note, however,
@@ -365,6 +365,9 @@ teleporting out a vault after guard appears could result in the guard being
if game ends while hero is in a vault wall breach or in guard's temporary
corridor, a message "you are encased in the rock" could be given when
guard repairs things (for possible bones); suppress it if hero is dead
DUMPLOG: output from '/' (#whatis) and ';' went into ^P message recall history
but was missing from DUMPLOG's message history due to special handling
for the first character which might be graphical rather than text
Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository

17
src/pager.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pager.c $NHDT-Date: 1546656415 2019/01/05 02:46:55 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.147 $ */
/* NetHack 3.6 pager.c $NHDT-Date: 1549334449 2019/02/05 02:40:49 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.150 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2018. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1242,6 +1242,21 @@ coord *click_cc;
if (found) {
/* use putmixed() because there may be an encoded glyph present */
putmixed(WIN_MESSAGE, 0, out_str);
#ifdef DUMPLOG
{
char dmpbuf[BUFSZ];
/* putmixed() bypasses pline() so doesn't write to DUMPLOG;
tty puts it into ^P recall, so it ought to be there;
DUMPLOG is plain text, so override graphics character;
at present, force space, but we ought to use defsyms[]
value for the glyph the graphics character came from */
(void) decode_mixed(dmpbuf, out_str);
if (dmpbuf[0] < ' ' || dmpbuf[0] >= 127) /* ASCII isprint() */
dmpbuf[0] = ' ';
dumplogmsg(dmpbuf);
}
#endif
/* check the data file for information about this thing */
if (found == 1 && ans != LOOK_QUICK && ans != LOOK_ONCE