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

Merge branch 'fix-detect' of https://github.com/argrath/NetHack into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2024-01-08 23:45:53 -05:00
parent 0ca1a1ca8e 190d840d2a
commit a764d4fd61
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detect.c
+16 -18
View File
@@ -367,26 +367,24 @@ gold_detect(struct obj *sobj)
if (!gk.known) { if (!gk.known) {
/* no gold found on floor or monster's inventory. /* no gold found on floor or monster's inventory.
adjust message if you have gold in your inventory */ adjust message if you have gold in your inventory */
if (sobj) { char buf[BUFSZ];
char buf[BUFSZ];
if (gy.youmonst.data == &mons[PM_GOLD_GOLEM]) if (gy.youmonst.data == &mons[PM_GOLD_GOLEM])
Sprintf(buf, "You feel like a million %s!", currency(2L)); Sprintf(buf, "You feel like a million %s!", currency(2L));
else if (money_cnt(gi.invent) || hidden_gold(TRUE)) else if (money_cnt(gi.invent) || hidden_gold(TRUE))
Strcpy(buf, Strcpy(buf,
"You feel worried about your future financial situation."); "You feel worried about your future financial situation.");
else if (steedgold) else if (steedgold)
Sprintf(buf, "You feel interested in %s financial situation.", Sprintf(buf, "You feel interested in %s financial situation.",
s_suffix(x_monnam(u.usteed, s_suffix(x_monnam(u.usteed,
u.usteed->mtame ? ARTICLE_YOUR u.usteed->mtame ? ARTICLE_YOUR
: ARTICLE_THE, : ARTICLE_THE,
(char *) 0, (char *) 0,
SUPPRESS_SADDLE, FALSE))); SUPPRESS_SADDLE, FALSE)));
else else
Strcpy(buf, "You feel materially poor."); Strcpy(buf, "You feel materially poor.");
strange_feeling(sobj, buf); strange_feeling(sobj, buf);
}
return 1; return 1;
} }
/* only under me - no separate display required */ /* only under me - no separate display required */