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

polywarn followup (trunk only)

Browse Source
This commit is contained in:
nethack.allison
2004-06-04 01:10:44 +00:00
parent 6644c4086f
commit d9e2105d22
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/artifact.c
View File

@@ -1523,14 +1523,14 @@ long *abil;
wornbits = (wornmask & *abil); wornbits = (wornmask & *abil);
for(obj = invent; obj; obj = obj->nobj) { for(obj = invent; obj; obj = obj->nobj) {
if(obj->oartifact) { if(obj->oartifact && ((abil != &EWarn_of_mon) || context.warntype.obj)) {
register const struct artifact *art = get_artifact(obj); register const struct artifact *art = get_artifact(obj);
if (art) { if (art) {
if (dtyp && if (dtyp &&
(art->cary.adtyp == dtyp || art->defn.adtyp == dtyp)) (art->cary.adtyp == dtyp || art->defn.adtyp == dtyp))
return obj; return obj;
if (spfx && ((art->cspfx & spfx) == spfx || if (spfx && ((art->cspfx & spfx) == spfx ||
(art->spfx &spfx) == spfx)) (art->spfx & spfx) == spfx))
return obj; return obj;
} }
} else { } else {

2
src/cmd.c
View File

@@ -991,7 +991,7 @@ int final; /* 0 => still in progress; 1 => over, survived; 2 => dead */
(context.warntype.polyd & M2_ORC) ? "orcs" : (context.warntype.polyd & M2_ORC) ? "orcs" :
(context.warntype.polyd & M2_DEMON) ? "demons" : (context.warntype.polyd & M2_DEMON) ? "demons" :
"certain monsters"); "certain monsters");
you_are(buf,from_what(WARN_OF_MON)); you_are(buf,"");
} }
if (Warn_of_mon && context.warntype.speciesidx) { if (Warn_of_mon && context.warntype.speciesidx) {
Sprintf(buf, "aware of the presence of %s", Sprintf(buf, "aware of the presence of %s",