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

Fix wishing for tins of specific type

Browse Source 
I believe this bug already existed, but was only exposed by
my wishing parser change post-3.6.0
This commit is contained in:
Pasi Kallinen
2016-12-14 18:28:01 +02:00
parent f3b1cc74c6
commit f4632732ac
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objnam.c
+5 -4
View File
@@ -2839,11 +2839,12 @@ struct obj *no_wish;
*/ */
if (!strstri(bp, "wand ") && !strstri(bp, "spellbook ") if (!strstri(bp, "wand ") && !strstri(bp, "spellbook ")
&& !strstri(bp, "finger ")) { && !strstri(bp, "finger ")) {
if (((p = strstri(bp, "tin of ")) != 0) if ((p = strstri(bp, "tin of ")) != 0) {
&& (tmp = tin_variety_txt(p + 7, &tinv)) tmp = tin_variety_txt(p + 7, &tinv);
&& (mntmp = name_to_mon(p + 7 + tmp)) >= LOW_PM) {
*(p + 3) = 0;
tvariety = tinv; tvariety = tinv;
mntmp = name_to_mon(p + 7 + tmp);
typ = TIN;
goto typfnd;
} else if ((p = strstri(bp, " of ")) != 0 } else if ((p = strstri(bp, " of ")) != 0
&& (mntmp = name_to_mon(p + 4)) >= LOW_PM) && (mntmp = name_to_mon(p + 4)) >= LOW_PM)
*p = 0; *p = 0;