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

merge conflict fix part 3

Browse Source
This commit is contained in:
nhmall
2019-02-04 20:52:21 -05:00
parent 339072e8df
commit d2ed79e1d1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pline.c
View File

@@ -170,7 +170,7 @@ VA_DECL(const char *, line)
msgtyp = msgtype_type(line, no_repeat);
if ((g.pline_flags & URGENT_MESSAGE) == 0
&& (msgtyp == MSGTYP_NOSHOW
|| (msgtyp == MSGTYP_NOREP && !strcmp(line, prevmsg))))
|| (msgtyp == MSGTYP_NOREP && !strcmp(line, g.prevmsg))))
/* FIXME: we need a way to tell our caller that this message
* was suppressed so that caller doesn't set iflags.last_msg
* for something that hasn't been shown, otherwise a subsequent