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

fix the tty message spacing anomaly for messages \

Browse Source 
delivered across level change checkpointing

Reported by entrez.  Simplest test case:  give level 1 a short
annotatation, level teleport to level 2, and level teleport back to
level 1.  The message window will show

|You materialize on another level.  You remember this level as <note>.

but ^P message history will show

|You materialize on another level.
|  You remember this level as <note>.

Spaces inserted to separate two messages that fit together on the
top line become part of the second message when saving a checkpoint
during level change flushes the top line into message history.

Change insurance checkpointing to record the full message history
without flushing the current top line so that toggling 'checkpoint'
doesn't affect what shows up on the screen or in message recall.
This commit is contained in:
PatR
2022-08-30 15:01:49 -07:00
parent ed7e60f661
commit d4f0450afe
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
win/tty/topl.c
View File

@@ -184,8 +184,10 @@ remember_topl(void)
cw->datlen[idx] = (short) len;
}
Strcpy(cw->data[idx], g.toplines);
*g.toplines = '\0';
cw->maxcol = cw->maxrow = (idx + 1) % cw->rows;
if (!g.program_state.in_checkpoint) {
*g.toplines = '\0';
cw->maxcol = cw->maxrow = (idx + 1) % cw->rows;
}
}
void
@@ -360,13 +362,16 @@ extern char erase_char; /* from xxxtty.c; don't need kill_char */
/* returns a single keystroke; also sets 'yn_number' */
char
tty_yn_function(const char *query, const char *resp, char def)
tty_yn_function(
const char *query,
const char *resp,
char def)
{
/*
* Generic yes/no function. 'def' is the default (returned by space
* or return; 'esc' returns 'q', or 'n', or the default, depending on
* what's in the string. The 'query' string is printed before the user
* is asked about the string.
* what's in the expected-response string. The 'query' string is
* printed before the user is asked about the string.
*
* If resp is NULL, any single character is accepted and returned.
* If not-NULL, only characters in it are allowed (exceptions: the
@@ -548,8 +553,8 @@ static char **snapshot_mesgs = 0;
/* collect currently available message history data into a sequential array;
optionally, purge that data from the active circular buffer set as we go */
static void
msghistory_snapshot(boolean purge) /* clear message history buffer
as we copy it */
msghistory_snapshot(
boolean purge) /* clear message history buffer as we copy it */
{
char *mesg;
int i, inidx, outidx;