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

msghistory bandage

Browse Source 
Have genl_putmsghistory() pass the message to pline() for the !restoring
case, so that quest summary lines are delivered as ordinary messages.
No effect on tty or win32, which have their own putmsghistory routines.
But for X11, which has a multi-line message window but no save/restore
implementation for its contents, this makes the quest summary lines
actually show up somewhere.  (I looked at maybe implementing
X11_getmsghistory() and X11_putmsghistory() but don't have the energy to
tackle it.)

Other interfaces which lack their own history save/restore will see the
quest summary messages too.  Presumeably they'll all have multi-line
history windows so the extra line won't be displacing the most recent
message.  If not, they'll essentially get the long quest messages twice,
once in full via popup window, then the one-line summary via pline.
This commit is contained in:
PatR
2015-05-23 00:59:18 -07:00
parent 905c21dbe8
commit ae78865da8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/windows.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 windows.c $NHDT-Date: 1431192762 2015/05/09 17:32:42 $ $NHDT-Branch: master $:$NHDT-Revision: 1.26 $ */
/* NetHack 3.6 windows.c $NHDT-Date: 1432367952 2015/05/23 07:59:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.27 $ */
/* NetHack 3.6 windows.c $Date: 2012/01/23 10:45:28 $ $Revision: 1.23 $ */
/* Copyright (c) D. Cohrs, 1993. */
/* NetHack may be freely redistributed. See license for details. */
@@ -362,7 +362,7 @@ char let UNUSED;
int how UNUSED;
const char *mesg;
{
pline1(mesg);
pline("%s", mesg);
return 0;
}
@@ -397,11 +397,10 @@ boolean init UNUSED;
return (char *) 0;
}
/*ARGSUSED*/
void
genl_putmsghistory(msg, is_restoring)
const char *msg UNUSED;
boolean is_restoring UNUSED;
const char *msg;
boolean is_restoring;
{
/* window ports can provide
their own putmsghistory() routine to
@@ -420,9 +419,11 @@ boolean is_restoring UNUSED;
so it should keep all pointers/indexes
intact at the end of each call.
*/
#if 0 /* maybe... */
if (!is_restoring) pline1("%s", msg);
#endif
/* this doesn't provide for reloading the message window with the
previous session's messages upon restore, but it does put the quest
message summary lines there by treating them as ordinary messages */
if (!is_restoring)
pline("%s", msg);
return;
}