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

fix #U1206 - Quest artifact in WIZKIT file aborts program

Browse Source 
Fix the wizard mode crash From a bug report.  Move the WIZKIT
message suppression to a lower level instead of trying to guard against
present and future pline() calls in the wishing code.  The way that was
being handling wasn't suitable for dealing with quest feedback.

     This also includes a couple of additional wishing synonyms.
This commit is contained in:
nethack.rankin
2004-11-24 02:50:32 +00:00
parent 0600cf70ca
commit 00dcc2ae4c
8 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/questpgr.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)questpgr.c 3.4 2000/05/05 */
/* SCCS Id: @(#)questpgr.c 3.4 2004/11/22 */
/* Copyright 1991, M. Stephenson */
/* NetHack may be freely redistributed. See license for details. */
@@ -24,6 +24,7 @@ STATIC_DCL void FDECL(convert_arg, (CHAR_P));
STATIC_DCL void NDECL(convert_line);
STATIC_DCL void FDECL(deliver_by_pline, (struct qtmsg *));
STATIC_DCL void FDECL(deliver_by_window, (struct qtmsg *,int));
STATIC_DCL boolean FDECL(skip_pager, (BOOLEAN_P));
static char in_line[80], cvt_buf[64], out_line[128];
static struct qtlists qt_list;
@@ -386,12 +387,32 @@ int how;
destroy_nhwindow(datawin);
}
boolean
skip_pager(common)
boolean common;
{
#ifdef WIZARD
/* WIZKIT: suppress plot feedback if starting with quest artifact */
if (program_state.wizkit_wishing) return TRUE;
#endif
if (!(common ? qt_list.common : qt_list.chrole)) {
panic("%s: no %s quest text data available",
common ? "com_pager" : "qt_pager",
common ? "common" : "role-specific");
/*NOTREACHED*/
return TRUE;
}
return FALSE;
}
void
com_pager(msgnum)
int msgnum;
{
struct qtmsg *qt_msg;
if (skip_pager(TRUE)) return;
if (!(qt_msg = msg_in(qt_list.common, msgnum))) {
impossible("com_pager: message %d not found.", msgnum);
return;
@@ -410,6 +431,8 @@ int msgnum;
{
struct qtmsg *qt_msg;
if (skip_pager(FALSE)) return;
if (!(qt_msg = msg_in(qt_list.chrole, msgnum))) {
impossible("qt_pager: message %d not found.", msgnum);
return;