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

6
src/zap.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)zap.c 3.4 2004/09/10 */
/* SCCS Id: @(#)zap.c 3.4 2004/11/22 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -4232,12 +4232,12 @@ retry:
* has been denied. Wishing for "nothing" requires a separate
* value to remain distinct.
*/
otmp = readobjnam(buf, &nothing, TRUE);
otmp = readobjnam(buf, &nothing);
if (!otmp) {
pline("Nothing fitting that description exists in the game.");
if (++tries < 5) goto retry;
pline(thats_enough_tries);
otmp = readobjnam((char *)0, (struct obj *)0, TRUE);
otmp = readobjnam((char *)0, (struct obj *)0);
if (!otmp) return; /* for safety; should never happen */
} else if (otmp == &nothing) {
/* explicitly wished for "nothing", presumeably attempting