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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-09 07:24:18 -05:00
parent 7eee5f3a1d 624aee7749
commit 58f2218c4e
39 changed files with 239 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/zap.c
View File

@@ -5208,7 +5208,7 @@ makewish()
int tries = 0;
promptbuf[0] = '\0';
nothing = g.zeroobj; /* lint suppression; only its address matters */
nothing = cg.zeroobj; /* lint suppression; only its address matters */
if (flags.verbose)
You("may wish for an object.");
retry:
@@ -5226,7 +5226,7 @@ retry:
}
/*
* Note: if they wished for and got a non-object successfully,
* otmp == &g.zeroobj. That includes gold, or an artifact that
* otmp == &cg.zeroobj. That includes gold, or an artifact that
* has been denied. Wishing for "nothing" requires a separate
* value to remain distinct.
*/
@@ -5248,7 +5248,7 @@ retry:
/* KMH, conduct */
u.uconduct.wishes++;
if (otmp != &g.zeroobj) {
if (otmp != &cg.zeroobj) {
const char
*verb = ((Is_airlevel(&u.uz) || u.uinwater) ? "slip" : "drop"),
*oops_msg = (u.uswallow