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

yet more #1112 - slippery hands vs sink

Browse Source 
Fake object used for 'hands' has an address, so checking for a Null
pointer won't recognize it.
This commit is contained in:
PatR
2023-11-10 09:38:40 -08:00
parent 27e727d7d7
commit 069855eefc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fountain.c
+4 -3
View File
@@ -704,16 +704,17 @@ void
dipsink(struct obj *obj) dipsink(struct obj *obj)
{ {
boolean try_call = FALSE, boolean try_call = FALSE,
not_looted_yet = (levl[u.ux][u.uy].looted & S_LRING) == 0; not_looted_yet = (levl[u.ux][u.uy].looted & S_LRING) == 0,
is_hands = (obj == &gi.invalid_obj || (uarmg && obj == uarmg));
if (!rn2(not_looted_yet ? 25 : 15)) { if (!rn2(not_looted_yet ? 25 : 15)) {
/* can't rely on using sink for unlimited scroll blanking; however, /* can't rely on using sink for unlimited scroll blanking; however,
since sink will be converted into a fountain, hero can dip again */ since sink will be converted into a fountain, hero can dip again */
breaksink(u.ux, u.uy); /* "The pipes break! Water spurts out!" */ breaksink(u.ux, u.uy); /* "The pipes break! Water spurts out!" */
if (Glib && (!obj || obj == uarmg)) if (Glib && is_hands)
Your("%s are still slippery.", fingers_or_gloves(TRUE)); Your("%s are still slippery.", fingers_or_gloves(TRUE));
return; return;
} else if (obj == &gi.invalid_obj || obj == uarmg) { } else if (is_hands) {
(void) wash_hands(); (void) wash_hands();
return; return;
} else if (obj->oclass != POTION_CLASS) { } else if (obj->oclass != POTION_CLASS) {