fix #U1206 - Quest artifact in WIZKIT file aborts program
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:
@@ -1,4 +1,4 @@
|
||||
/* SCCS Id: @(#)decl.h 3.4 2001/12/10 */
|
||||
/* SCCS Id: @(#)decl.h 3.4 2004/11/22 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -158,6 +158,9 @@ E NEARDATA struct sinfo {
|
||||
#ifdef PANICLOG
|
||||
int in_paniclog;
|
||||
#endif
|
||||
#ifdef WIZARD
|
||||
int wizkit_wishing;
|
||||
#endif
|
||||
} program_state;
|
||||
|
||||
E boolean restoring;
|
||||
|
||||
@@ -1435,7 +1435,7 @@ E char *FDECL(Ysimple_name2, (struct obj *));
|
||||
E char *FDECL(bare_artifactname, (struct obj *));
|
||||
E char *FDECL(makeplural, (const char *));
|
||||
E char *FDECL(makesingular, (const char *));
|
||||
E struct obj *FDECL(readobjnam, (char *,struct obj *,BOOLEAN_P));
|
||||
E struct obj *FDECL(readobjnam, (char *,struct obj *));
|
||||
E int FDECL(rnd_class, (int,int));
|
||||
E const char *FDECL(cloak_simple_name, (struct obj *));
|
||||
E const char *FDECL(helm_simple_name, (struct obj *));
|
||||
|
||||
Reference in New Issue
Block a user