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

overriding message suppression, revisited

Browse Source 
This is more robust than the previous hack.  The issue of whether to
use it in other places is still unexplored.  Ultimately it's the user's
fault if overzealous message suppression hides something important.
[For an eerie game, try 'MSGTYPE=hide .'.]
This commit is contained in:
PatR
2016-01-19 18:16:13 -08:00
parent 7482be39e8
commit 2e2b54e548
6 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pline.c
View File

@@ -87,26 +87,9 @@ VA_DECL(const char *, line)
return;
}
/*
* Normally the sequence is
* caller: pline("some message");
* pline: vsprintf + putstr + iflags.last_msg = PLNMSG_UNKNOWN;
* caller: iflags.last_msg = PLNMSG_some_message;
* and subsequent code can adjust the next message if it is
* affected by some_message.
*
* But some callers can use last_msg to control handling of next
* message
* caller: iflags.last_msg = PLNMSG_NOREP_OVERRIDE;
* caller: pline("another message");
* to force another_message to be delivered even if is a repeat
* and user's MSGTYPE settings have classified it as don't-repeat.
*/
msgtyp = msgtype_type(line, no_repeat);
if ((msgtyp == MSGTYP_NOSHOW && iflags.last_msg != PLNMSG_NOSHO_OVERRIDE)
|| (msgtyp == MSGTYP_NOREP && iflags.last_msg != PLNMSG_NOREP_OVERRIDE
&& !strcmp(line, prevmsg)))
if (msgtyp == MSGTYP_NOSHOW
|| (msgtyp == MSGTYP_NOREP && !strcmp(line, prevmsg)))
return;
if (vision_full_recalc)
vision_recalc(0);