follow-up: function name

This commit is contained in:
nhmall
2025-09-05 09:26:00 -04:00
parent d3db5ce4f1
commit 602678aa5a
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -3409,8 +3409,8 @@ extern int passive(struct monst *, struct obj *, boolean, boolean, uchar,
extern void passive_obj(struct monst *, struct obj *, struct attack *) NONNULLARG1; extern void passive_obj(struct monst *, struct obj *, struct attack *) NONNULLARG1;
extern void that_is_a_mimic(struct monst *, unsigned) NONNULLARG1; extern void that_is_a_mimic(struct monst *, unsigned) NONNULLARG1;
extern void stumble_onto_mimic(struct monst *) NONNULLARG1; extern void stumble_onto_mimic(struct monst *) NONNULLARG1;
extern boolean mimic_disguised_as_non_mon(struct monst *) NONNULLARG1; extern boolean disguised_as_non_mon(struct monst *) NONNULLARG1;
extern boolean mimic_disguised_as_mon(struct monst *) NONNULLARG1; extern boolean disguised_as_mon(struct monst *) NONNULLARG1;
extern int flash_hits_mon(struct monst *, struct obj *) NONNULLARG12; extern int flash_hits_mon(struct monst *, struct obj *) NONNULLARG12;
extern void light_hits_gremlin(struct monst *, int) NONNULLARG1; extern void light_hits_gremlin(struct monst *, int) NONNULLARG1;
+2 -2
View File
@@ -6260,7 +6260,7 @@ stumble_onto_mimic(struct monst *mtmp)
} }
boolean boolean
mimic_disguised_as_non_mon(struct monst *mtmp) disguised_as_non_mon(struct monst *mtmp)
{ {
return (!sensemon(mtmp) return (!sensemon(mtmp)
&& M_AP_TYPE(mtmp) && M_AP_TYPE(mtmp)
@@ -6268,7 +6268,7 @@ mimic_disguised_as_non_mon(struct monst *mtmp)
} }
boolean boolean
mimic_disguised_as_mon(struct monst *mtmp) disguised_as_mon(struct monst *mtmp)
{ {
return (M_AP_TYPE(mtmp) return (M_AP_TYPE(mtmp)
&& M_AP_TYPE(mtmp) == M_AP_MONSTER); && M_AP_TYPE(mtmp) == M_AP_MONSTER);
+2 -2
View File
@@ -192,7 +192,7 @@ bhitm(struct monst *mtmp, struct obj *otmp)
reveal_invis = TRUE; reveal_invis = TRUE;
learn_it = cansee(gb.bhitpos.x, gb.bhitpos.y); learn_it = cansee(gb.bhitpos.x, gb.bhitpos.y);
if (resists_magm(mtmp)) { /* match effect on player */ if (resists_magm(mtmp)) { /* match effect on player */
if (disguised_mimic && !mimic_disguised_as_mon(mtmp)) if (disguised_mimic && !disguised_as_mon(mtmp))
seemimic(mtmp); seemimic(mtmp);
shieldeff(mtmp->mx, mtmp->my); shieldeff(mtmp->mx, mtmp->my);
pline("Boing!"); pline("Boing!");
@@ -4887,7 +4887,7 @@ dobuzz(
range -= 2; range -= 2;
} else { } else {
if (saymiss if (saymiss
|| (canseemon(mon) && !mimic_disguised_as_non_mon(mon))) || (canseemon(mon) && !disguised_as_non_mon(mon)))
miss(flash_str(fltyp, FALSE), mon); miss(flash_str(fltyp, FALSE), mon);
} }
} else if (u_at(sx, sy) && range >= 0) { } else if (u_at(sx, sy) && range >= 0) {