diff --git a/include/hack.h b/include/hack.h index ac9c8bd41..a90e388ca 100644 --- a/include/hack.h +++ b/include/hack.h @@ -1573,9 +1573,7 @@ typedef uint32_t mmflags_nht; /* makemon MM_ flags */ #if !defined(CROSSCOMPILE) || defined(CROSSCOMPILE_TARGET) #include "nhlua.h" #endif - #include "extern.h" #include "decl.h" - #endif /* HACK_H */ diff --git a/src/allmain.c b/src/allmain.c index 0786cd740..e26f171f7 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -881,7 +881,7 @@ interrupt_multi(const char *msg) { if (gm.multi > 0 && !gc.context.travel && !gc.context.run) { nomul(0); - if (Verbose(0,interrupt_multi) && msg) + if (flags.verbose && msg) Norep("%s", msg); } } diff --git a/src/apply.c b/src/apply.c index 6051b6a64..f05399e6b 100644 --- a/src/apply.c +++ b/src/apply.c @@ -422,7 +422,7 @@ use_stethoscope(struct obj *obj) pline("%s %s %s really %s.", use_plural ? "Those" : "That", what, use_plural ? "are" : "is", mnm); - } else if (Verbose(0, use_stethoscope) && !canspotmon(mtmp)) { + } else if (flags.verbose && !canspotmon(mtmp)) { There("is %s there.", mnm); } diff --git a/src/artifact.c b/src/artifact.c index 662107205..f07f52c39 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -1306,7 +1306,7 @@ Mb_hit(struct monst *magr, /* attacker */ shieldeff(youdefend ? u.ux : mdef->mx, youdefend ? u.uy : mdef->my); } - if ((do_stun || do_confuse) && Verbose(0,Mb_hit)) { + if ((do_stun || do_confuse) && flags.verbose) { char buf[BUFSZ]; buf[0] = '\0'; diff --git a/src/attrib.c b/src/attrib.c index b6080602e..94d848109 100644 --- a/src/attrib.c +++ b/src/attrib.c @@ -170,7 +170,7 @@ adjattrib( abonflg = (ABON(ndx) > 0); } if (ACURR(ndx) == old_acurr) { - if (msgflg == 0 && Verbose(0, adjattrib)) { + if (msgflg == 0 && flags.verbose) { if (ABASE(ndx) == old_abase && AMAX(ndx) == old_amax) { pline("You're %s as %s as you can get.", abonflg ? "currently" : "already", attrstr); diff --git a/src/ball.c b/src/ball.c index a0abbca1b..31231fe48 100644 --- a/src/ball.c +++ b/src/ball.c @@ -58,7 +58,7 @@ ballfall(void) if (hard_helmet(uarmh)) { pline("Fortunately, you are wearing a hard helmet."); dmg = 3; - } else if (Verbose(0, ballfall)) + } else if (flags.verbose) pline("%s does not protect you.", Yname2(uarmh)); } losehp(Maybe_Half_Phys(dmg), "crunched in the head by an iron ball", diff --git a/src/decl.c b/src/decl.c index 1518fa780..bfccddc68 100644 --- a/src/decl.c +++ b/src/decl.c @@ -1056,9 +1056,6 @@ decl_globals_init(void) gu.urace = urace_init_data; } -#ifndef NO_VERBOSE_GRANULARITY -long verbosity_suppressions[vb_elements] = { 0L, 0L, 0L, 0L, 0L, }; -#endif /* gcc 12.2's static analyzer thinks that some fields of gc.context.victual are uninitialized when compiling 'bite(eat.c)' but that's impossible; @@ -1072,5 +1069,4 @@ sa_victual( { return; } - /*decl.c*/ diff --git a/src/detect.c b/src/detect.c index f32809aa1..00960fba9 100644 --- a/src/detect.c +++ b/src/detect.c @@ -1250,12 +1250,12 @@ use_crystal_ball(struct obj **optr) } /* read a single character */ - if (Verbose(0, use_crystal_ball1)) + if (flags.verbose) You("may look for an object, monster, or special map symbol."); ch = yn_function("What do you look for?", (char *) 0, '\0', TRUE); /* Don't filter out ' ' here; it has a use */ if ((ch != def_monsyms[S_GHOST].sym) && strchr(quitchars, ch)) { - if (Verbose(0, use_crystal_ball2)) + if (flags.verbose) pline1(Never_mind); return; } diff --git a/src/dig.c b/src/dig.c index 8c4e2f269..04c1419a1 100644 --- a/src/dig.c +++ b/src/dig.c @@ -618,7 +618,7 @@ digactualhole(coordxy x, coordxy y, struct monst *madeby, int ttyp) wake_nearby(); } else if (!madeby_obj && canseemon(madeby)) { pline("%s digs a pit in the %s.", Monnam(madeby), surface_type); - } else if (cansee(x, y) && Verbose(0, digactualhole1)) { + } else if (cansee(x, y) && flags.verbose) { pline("A pit appears in the %s.", surface_type); } /* in case we're digging down while encased in solid rock @@ -650,7 +650,7 @@ digactualhole(coordxy x, coordxy y, struct monst *madeby, int ttyp) else if (!madeby_obj && canseemon(madeby)) pline("%s digs a hole through the %s.", Monnam(madeby), surface_type); - else if (cansee(x, y) && Verbose(0, digactualhole2)) + else if (cansee(x, y) && flags.verbose) pline("A hole appears in the %s.", surface_type); if (at_u) { @@ -1304,7 +1304,7 @@ mdig_tunnel(struct monst *mtmp) return TRUE; } } else { - if (Verbose(0, mdig_tunnel1)) { + if (flags.verbose) { if (!Unaware && !rn2(3)) /* not too often.. */ draft_message(TRUE); /* "You feel an unexpected draft." */ } @@ -1331,7 +1331,7 @@ mdig_tunnel(struct monst *mtmp) if (IS_WALL(here->typ)) { /* KMH -- Okay on arboreal levels (room walls are still stone) */ - if (Verbose(0, mdig_tunnel2) && !rn2(5)) { + if (flags.verbose && !rn2(5)) { Soundeffect(se_crashing_rock, 75); You_hear("crashing rock."); } @@ -2018,7 +2018,7 @@ rot_corpse(anything *arg, long timeout) x = obj->ox; y = obj->oy; } else if (in_invent) { - if (Verbose(0, rot_corpse)) { + if (flags.verbose) { char *cname = corpse_xname(obj, (const char *) 0, CXN_NO_PFX); Your("%s%s %s away%c", obj == uwep ? "wielded " : "", cname, diff --git a/src/do.c b/src/do.c index 3a667763f..75f6bee66 100644 --- a/src/do.c +++ b/src/do.c @@ -100,7 +100,7 @@ boulder_hits_pool( Strcpy(whobuf, y_monnam(u.usteed)); pline("%s %s %s into the %s.", upstart(whobuf), vtense(whobuf, "push"), the(xname(otmp)), what); - if (Verbose(0, boulder_hits_pool1) && !Blind) + if (flags.verbose && !Blind) pline("Now you can cross it!"); /* no splashing in this case */ } @@ -136,7 +136,7 @@ boulder_hits_pool( dmg = d((Fire_resistance ? 1 : 3), 6); losehp(Maybe_Half_Phys(dmg), /* lava damage */ "molten lava", KILLED_BY); - } else if (!fills_up && Verbose(0, boulder_hits_pool2) + } else if (!fills_up && flags.verbose && (pushing ? !Blind : cansee(rx, ry))) pline("It sinks without a trace!"); } @@ -685,7 +685,7 @@ drop(struct obj *obj) if (u.uswallow) { /* barrier between you and the floor */ - if (Verbose(0, drop1)) { + if (flags.verbose) { char *onam_p, *mnam_p, monbuf[BUFSZ]; mnam_p = mon_nam(u.ustuck); @@ -713,7 +713,7 @@ drop(struct obj *obj) if (levhack) ELevitation = W_ART; /* other than W_ARTI */ - if (Verbose(0, drop2)) + if (flags.verbose) You("drop %s.", doname(obj)); freeinv(obj); hitfloor(obj, TRUE); @@ -721,7 +721,7 @@ drop(struct obj *obj) float_down(I_SPECIAL | TIMEOUT, W_ARTI | W_ART); return ECMD_TIME; } - if (!IS_ALTAR(levl[u.ux][u.uy].typ) && Verbose(0, drop3)) + if (!IS_ALTAR(levl[u.ux][u.uy].typ) && flags.verbose) You("drop %s.", doname(obj)); } dropx(obj); @@ -1682,7 +1682,7 @@ goto_level( /* you climb up the {stairs|ladder}; fly up the stairs; fly up along the ladder */ great_effort = (Punished && !Levitation); - if (Verbose(0, go_to_level1) || great_effort) + if (flags.verbose || great_effort) pline("%s %s up%s the %s.", great_effort ? "With great effort, you" : "You", u_locomotion("climb"), @@ -1700,7 +1700,7 @@ goto_level( if (!u.dz) { ; /* stayed on same level? (no transit effects) */ } else if (Flying) { - if (Verbose(0, go_to_level2)) + if (flags.verbose) You("fly down %s.", ga.at_ladder ? "along the ladder" : "the stairs"); } else if (near_capacity() > UNENCUMBERED @@ -1721,7 +1721,7 @@ goto_level( KILLED_BY); selftouch("Falling, you"); } else { /* ordinary descent */ - if (Verbose(0, go_to_level3)) + if (flags.verbose) You("%s.", ga.at_ladder ? "climb down the ladder" : "descend the stairs"); } diff --git a/src/do_name.c b/src/do_name.c index b520277da..5d074ed24 100644 --- a/src/do_name.c +++ b/src/do_name.c @@ -821,7 +821,7 @@ getpos(coord *ccp, boolean force, const char *goal) if (!goal) goal = "desired location"; - if (Verbose(0, getpos1)) { + if (flags.verbose) { pline("(For instructions type a '%s')", visctrl(gc.Cmd.spkeys[NHKF_GETPOS_HELP])); msg_given = TRUE; @@ -965,7 +965,7 @@ getpos(coord *ccp, boolean force, const char *goal) } else if (c == gc.Cmd.spkeys[NHKF_GETPOS_AUTODESC]) { iflags.autodescribe = !iflags.autodescribe; pline("Automatic description %sis %s.", - Verbose(0, getpos2) ? "of features under cursor " : "", + flags.verbose ? "of features under cursor " : "", iflags.autodescribe ? "on" : "off"); if (!iflags.autodescribe) show_goal_msg = TRUE; diff --git a/src/do_wear.c b/src/do_wear.c index 8bd865766..360db9579 100644 --- a/src/do_wear.c +++ b/src/do_wear.c @@ -62,7 +62,7 @@ fingers_or_gloves(boolean check_gloves) void off_msg(struct obj *otmp) { - if (Verbose(0, off_msg)) + if (flags.verbose) You("were wearing %s.", doname(otmp)); } @@ -70,7 +70,7 @@ off_msg(struct obj *otmp) static void on_msg(struct obj *otmp) { - if (Verbose(0, on_msg)) { + if (flags.verbose) { char how[BUFSZ]; /* call xname() before obj_is_pname(); formatting obj's name might set obj->dknown and that affects the pname test */ @@ -1345,7 +1345,7 @@ Blindf_on(struct obj *otmp) if (Blind && !already_blind) { changed = TRUE; - if (Verbose(0, Blindf_on)) + if (flags.verbose) You_cant("see any more."); /* set ball&chain variables before the hero goes blind */ if (Punished) diff --git a/src/dogmove.c b/src/dogmove.c index 3261fffd5..5beaea770 100644 --- a/src/dogmove.c +++ b/src/dogmove.c @@ -301,7 +301,7 @@ dog_eat(struct monst *mtmp, mtmp->mstun = 1; if (canseemon(mtmp)) { obj_name = distant_name(obj, doname); /* (see above) */ - if (Verbose(0, dog_eat)) + if (flags.verbose) pline("%s spits %s out in disgust!", Monnam(mtmp), obj_name); } @@ -436,7 +436,7 @@ dog_invent(struct monst *mtmp, struct edog *edog, int udist) while otmp is still on floor */ char *otmpname = distant_name(otmp, doname); - if (Verbose(0, dog_invent)) + if (flags.verbose) pline("%s picks up %s.", Monnam(mtmp), otmpname); } diff --git a/src/dothrow.c b/src/dothrow.c index a996d672f..cea2f77dc 100644 --- a/src/dothrow.c +++ b/src/dothrow.c @@ -1389,7 +1389,7 @@ toss_up(struct obj *obj, boolean hitsroof) /* helmet definitely protects you when it blocks petrification */ } else if (!petrifier) { - if (Verbose(0, toss_up)) + if (flags.verbose) Your("%s does not protect you.", helm_simple_name(uarmh)); } /* stone missile against hero in xorn form would have been diff --git a/src/eat.c b/src/eat.c index 9657ce707..11ec198b0 100644 --- a/src/eat.c +++ b/src/eat.c @@ -1501,7 +1501,7 @@ consume_tin(const char *mesg) pline("It smells like %s.", what); if (y_n("Eat it?") == 'n') { - if (Verbose(0, consume_tin1)) + if (flags.verbose) You("discard the open tin."); if (!Hallucination) tin->dknown = tin->known = 1; @@ -1554,7 +1554,7 @@ consume_tin(const char *mesg) } if (y_n("Eat it?") == 'n') { - if (Verbose(0, consume_tin2)) + if (flags.verbose) You("discard the open tin."); tin = costly_tin(COST_OPEN); goto use_up_tin; diff --git a/src/engrave.c b/src/engrave.c index 0b06e7c2a..c638c28e8 100644 --- a/src/engrave.c +++ b/src/engrave.c @@ -736,7 +736,7 @@ doengrave(void) ptext = TRUE; type = ENGRAVE; if (!objects[otmp->otyp].oc_name_known) { - if (Verbose(1, doengrave1)) + if (flags.verbose) pline("This %s is a wand of digging!", xname(otmp)); doknown = TRUE; } @@ -759,7 +759,7 @@ doengrave(void) ptext = TRUE; type = BURN; if (!objects[otmp->otyp].oc_name_known) { - if (Verbose(1, doengrave2)) + if (flags.verbose) pline("This %s is a wand of fire!", xname(otmp)); doknown = TRUE; } @@ -770,7 +770,7 @@ doengrave(void) ptext = TRUE; type = BURN; if (!objects[otmp->otyp].oc_name_known) { - if (Verbose(1, doengrave3)) + if (flags.verbose) pline("This %s is a wand of lightning!", xname(otmp)); doknown = TRUE; } diff --git a/src/explode.c b/src/explode.c index 188c3a85e..64de072e2 100644 --- a/src/explode.c +++ b/src/explode.c @@ -588,7 +588,7 @@ explode( if (uhurt) { /* give message for any monster-induced explosion or player-induced one other than scroll of fire */ - if (Verbose(1, explode) && (type < 0 || olet != SCROLL_CLASS)) { + if (flags.verbose && (type < 0 || olet != SCROLL_CLASS)) { if (do_hallu) { /* (see explanation above) */ do { Sprintf(hallu_buf, "%s explosion", diff --git a/src/hack.c b/src/hack.c index 573def033..59be98d5d 100644 --- a/src/hack.c +++ b/src/hack.c @@ -278,7 +278,7 @@ moverock(void) deliver_part1 = TRUE; map_invisible(rx, ry); } - if (Verbose(1, moverock)) { + if (flags.verbose) { char you_or_steed[BUFSZ]; Strcpy(you_or_steed, @@ -610,7 +610,7 @@ still_chewing(coordxy x, coordxy y) watch_dig((struct monst *) 0, x, y, FALSE); return 1; } else if ((gc.context.digging.effort += (30 + u.udaminc)) <= 100) { - if (Verbose(1, still_chewing)) + if (flags.verbose) You("%s chewing on the %s.", gc.context.digging.chew ? "continue" : "begin", boulder @@ -1453,7 +1453,7 @@ trapmove( switch (u.utraptype) { case TT_BEARTRAP: - if (Verbose(1, trapmove1)) { + if (flags.verbose) { predicament = "caught in a bear trap"; if (u.usteed) Norep("%s is %s.", upstart(steedname), predicament); @@ -1481,7 +1481,7 @@ trapmove( break; } if (--u.utrap) { - if (Verbose(1, trapmove2)) { + if (flags.verbose) { predicament = "stuck to the web"; if (u.usteed) Norep("%s is %s.", upstart(steedname), predicament); @@ -1496,7 +1496,7 @@ trapmove( } break; case TT_LAVA: - if (Verbose(1, trapmove3)) { + if (flags.verbose) { predicament = "stuck in the lava"; if (u.usteed) Norep("%s is %s.", upstart(steedname), predicament); @@ -1532,13 +1532,13 @@ trapmove( our next attempt to move out of tether range after this successful move would have its can't-do-that message suppressed by Norep */ - if (Verbose(1, trapmove4)) + if (flags.verbose) Norep("You move within the chain's reach."); return TRUE; } } if (--u.utrap) { - if (Verbose(1, trapmove5)) { + if (flags.verbose) { if (anchored) { predicament = "chained to the"; culprit = "buried ball"; diff --git a/src/invent.c b/src/invent.c index 9c0a18c0c..d0375ee27 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1735,7 +1735,7 @@ getobj( } } if (strchr(quitchars, ilet)) { - if (Verbose(1, getobj1)) + if (flags.verbose) pline1(Never_mind); return (struct obj *) 0; } @@ -1780,7 +1780,7 @@ getobj( if (ilet == HANDS_SYM) return (struct obj *) &cg.zeroobj; /* cast away 'const' */ if (ilet == '\033') { - if (Verbose(1, getobj2)) + if (flags.verbose) pline1(Never_mind); return (struct obj *) 0; } @@ -4630,7 +4630,7 @@ doprgold(void) person, but you have no such preternatural gold-sense. */ long hmoney = hidden_gold(FALSE); - if (Verbose(1, doprgold)) { + if (flags.verbose) { char buf[BUFSZ]; if (!umoney) { diff --git a/src/lock.c b/src/lock.c index bfe297a50..2de274937 100644 --- a/src/lock.c +++ b/src/lock.c @@ -1199,7 +1199,7 @@ doorlock(struct obj *otmp, coordxy x, coordxy y) } else { /* for mtmp, mb_trapped() does is own wake_nearto() */ loudness = 40; - if (Verbose(1, doorlock1)) { + if (flags.verbose) { Soundeffect(se_kaboom_door_explodes, 75); if ((sawit || seeit) && !Unaware) { pline("KABOOM!! You see a door explode."); @@ -1218,7 +1218,7 @@ doorlock(struct obj *otmp, coordxy x, coordxy y) unblock_point(x, y); seeit = cansee(x, y); newsym(x, y); - if (Verbose(1, doorlock2)) { + if (flags.verbose) { if ((sawit || seeit) && !Unaware) { pline_The("door crashes open!"); } else if (!Deaf) { diff --git a/src/mhitm.c b/src/mhitm.c index 17e55bdcd..e6a3d64a5 100644 --- a/src/mhitm.c +++ b/src/mhitm.c @@ -1154,7 +1154,7 @@ mon_poly(struct monst *magr, struct monst *mdef, int dmg) } else if (newcham(mdef, (struct permonst *) 0, NO_NC_FLAGS)) { if (gv.vis) { /* either seen or adjacent */ boolean was_seen = !!strcmpi("It", Before), - verbosely = Verbose(1, monpoly1) || !was_seen; + verbosely = flags.verbose || !was_seen; if (canspotmon(mdef)) pline("%s%s%s turns into %s.", Before, @@ -1174,7 +1174,7 @@ mon_poly(struct monst *magr, struct monst *mdef, int dmg) (void) rloc(magr, RLOC_MSG); } } else { - if (gv.vis && Verbose(1, monpoly2)) + if (gv.vis && flags.verbose) pline1(nothing_happens); } } @@ -1259,7 +1259,7 @@ mswingsm( struct monst *mdef, /* defender */ struct obj *otemp) /* attacker's weapon */ { - if (Verbose(1, mswingsm) && !Blind && mon_visible(magr)) { + if (flags.verbose && !Blind && mon_visible(magr)) { boolean bash = (is_pole(otemp) && dist2(magr->mx, magr->my, mdef->mx, mdef->my) <= 2); diff --git a/src/mhitu.c b/src/mhitu.c index 16c0b4856..a4494ca81 100644 --- a/src/mhitu.c +++ b/src/mhitu.c @@ -93,7 +93,7 @@ missmu(struct monst *mtmp, boolean nearmiss, struct attack *mattk) pline("%s pretends to be friendly.", Monnam(mtmp)); else pline("%s %smisses!", Monnam(mtmp), - (nearmiss && Verbose(1, missmu)) ? "just " : ""); + (nearmiss && flags.verbose) ? "just " : ""); stop_occupation(); } @@ -131,7 +131,7 @@ mswings( struct obj *otemp, /* attacker's weapon */ boolean bash) /* True: polearm used at too close range */ { - if (Verbose(1, mswings) && !Blind && mon_visible(mtmp)) { + if (flags.verbose && !Blind && mon_visible(mtmp)) { pline("%s %s %s%s %s.", Monnam(mtmp), mswings_verb(otemp, bash), (otemp->quan > 1L) ? "one of " : "", mhis(mtmp), xname(otemp)); } @@ -187,7 +187,7 @@ wildmiss(struct monst *mtmp, struct attack *mattk) /* no map_invisible() -- no way to tell where _this_ is coming from */ - if (!Verbose(1, wildmiss)) + if (!flags.verbose) return; /* no feedback if hero doesn't see the monster's spot */ if (!cansee(mtmp->mx, mtmp->my)) @@ -1488,7 +1488,7 @@ gulpmu(struct monst *mtmp, struct attack *mattk) You("get %s!", digests(mtmp->data) ? "regurgitated" : enfolds(mtmp->data) ? "released" : "expelled"); - if (Verbose(1, gulpmu) + if (flags.verbose && (digests(mtmp->data) && Slow_digestion)) pline("Obviously %s doesn't like your taste.", mon_nam(mtmp)); expels(mtmp, mtmp->data, FALSE); @@ -1536,7 +1536,7 @@ explmu(struct monst *mtmp, struct attack *mattk, boolean ufound) make_blinded((long) tmp, FALSE); if (!Blind) Your1(vision_clears); - } else if (Verbose(1, explmu)) + } else if (flags.verbose) You("get the impression it was not terribly bright."); } break; diff --git a/src/mon.c b/src/mon.c index ee930f843..965a29d3d 100644 --- a/src/mon.c +++ b/src/mon.c @@ -1260,7 +1260,7 @@ meatmetal(struct monst *mtmp) /* call distant_name() for its side-effects even when !verbose so won't be printed */ otmpname = distant_name(otmp, doname); - if (Verbose(1, meatmetal1)) + if (flags.verbose) pline("%s eats %s!", Monnam(mtmp), otmpname); } /* The object's rustproofing is gone now */ @@ -1269,7 +1269,7 @@ meatmetal(struct monst *mtmp) if (vis) { /* (see above; format even if it won't be printed) */ otmpname = distant_name(otmp, doname); - if (Verbose(1, meatmetal2)) + if (flags.verbose) pline("%s spits %s out in disgust!", Monnam(mtmp), otmpname); } @@ -1277,10 +1277,10 @@ meatmetal(struct monst *mtmp) if (cansee(mtmp->mx, mtmp->my)) { /* (see above; format even if it won't be printed) */ otmpname = distant_name(otmp, doname); - if (Verbose(1, meatmetal3)) + if (flags.verbose) pline("%s eats %s!", Monnam(mtmp), otmpname); } else { - if (Verbose(1, meatmetal4)) { + if (flags.verbose) { Soundeffect(se_crunching_sound, 50); You_hear("a crunching sound."); } @@ -1385,7 +1385,7 @@ meatobj(struct monst* mtmp) /* for gelatinous cubes */ if (cansee(mtmp->mx, mtmp->my)) { /* (see above; distant_name() sometimes has side-effects */ otmpname = distant_name(otmp, doname); - if (Verbose(2, meatobj1)) + if (flags.verbose) pline("%s eats %s!", Monnam(mtmp), otmpname); /* give this one even if !verbose */ if (otmp->oclass == SCROLL_CLASS @@ -1393,7 +1393,7 @@ meatobj(struct monst* mtmp) /* for gelatinous cubes */ pline("Yum%c", otmp->blessed ? '!' : '.'); } else { Soundeffect(se_slurping_sound, 30); - if (Verbose(2, meatobj2)) + if (flags.verbose) You_hear("a slurping sound."); } m_consume_obj(mtmp, otmp); @@ -1409,9 +1409,9 @@ meatobj(struct monst* mtmp) /* for gelatinous cubes */ } if (ecount > 0) { - if (cansee(mtmp->mx, mtmp->my) && Verbose(2, meatobj3) && buf[0]) + if (cansee(mtmp->mx, mtmp->my) && flags.verbose && buf[0]) pline1(buf); - else if (Verbose(2, meatobj4)) + else if (flags.verbose) You_hear("%s slurping sound%s.", (ecount == 1) ? "a" : "several", plur(ecount)); } @@ -1467,11 +1467,11 @@ meatcorpse( the result won't be printed */ char *otmpname = distant_name(otmp, doname); - if (Verbose(2, meatcorpse1)) + if (flags.verbose) pline("%s eats %s!", Monnam(mtmp), otmpname); } else { Soundeffect(se_masticating_sound, 50); - if (Verbose(2, meatcorpse2)) + if (flags.verbose) You_hear("a masticating sound."); } @@ -1605,7 +1605,7 @@ mpickgold(register struct monst* mtmp) obj_extract_self(gold); add_to_minv(mtmp, gold); if (cansee(mtmp->mx, mtmp->my)) { - if (Verbose(2, mpickgold) && !mtmp->isgd) + if (flags.verbose && !mtmp->isgd) pline("%s picks up some %s.", Monnam(mtmp), mat_idx == GOLD ? "gold" : "money"); newsym(mtmp->mx, mtmp->my); @@ -1665,7 +1665,7 @@ mpickstuff(struct monst *mtmp) from floor and subsequent pickup by mtmp */ char *otmpname = distant_name(otmp, doname); - if (Verbose(2, mpickstuff)) + if (flags.verbose) pline("%s picks up %s.", Monnam(mtmp), otmpname); } obj_extract_self(otmp3); /* remove from floor */ @@ -3856,7 +3856,7 @@ peacefuls_respond(struct monst *mtmp) alreadyfleeing = (mon->mflee || mon->mfleetim); monflee(mon, rn2(50) + 25, TRUE, !exclaimed); if (exclaimed) { - if (Verbose(2, setmangry) && !alreadyfleeing) { + if (flags.verbose && !alreadyfleeing) { Strcat(buf, " and then turns to flee."); needpunct = FALSE; } diff --git a/src/monmove.c b/src/monmove.c index c46494702..7833795ee 100644 --- a/src/monmove.c +++ b/src/monmove.c @@ -30,7 +30,7 @@ static int vamp_shift(struct monst *, struct permonst *, boolean); boolean mb_trapped(struct monst *mtmp, boolean canseeit) { - if (Verbose(2, mb_trapped)) { + if (flags.verbose) { if (canseeit && !Unaware) pline("KABOOM!! You see a door explode."); else if (!Deaf) @@ -1714,7 +1714,7 @@ m_move(register struct monst *mtmp, int after) } if ((here->doormask & (D_LOCKED | D_CLOSED)) != 0 && amorphous(ptr)) { - if (Verbose(2, m_move1) && canseemon(mtmp)) + if (flags.verbose && canseemon(mtmp)) pline("%s %s under the door.", Monnam(mtmp), (ptr == &mons[PM_FOG_CLOUD] || ptr->mlet == S_LIGHT) ? "flows" : "oozes"); @@ -1728,7 +1728,7 @@ m_move(register struct monst *mtmp, int after) if (mb_trapped(mtmp, canseeit)) return MMOVE_DIED; } else { - if (Verbose(2, m_move2)) { + if (flags.verbose) { if (canseeit && canspotmon(mtmp)) { pline("%s unlocks and opens a door.", Monnam(mtmp)); @@ -1746,7 +1746,7 @@ m_move(register struct monst *mtmp, int after) if (mb_trapped(mtmp, canseeit)) return MMOVE_DIED; } else { - if (Verbose(2, m_move3)) { + if (flags.verbose) { if (canseeit && canspotmon(mtmp)) { pline("%s opens a door.", Monnam(mtmp)); } else if (canseeit) { @@ -1769,7 +1769,7 @@ m_move(register struct monst *mtmp, int after) if (mb_trapped(mtmp, canseeit)) return MMOVE_DIED; } else { - if (Verbose(2, m_move4)) { + if (flags.verbose) { if (canseeit && canspotmon(mtmp)) { pline("%s smashes down a door.", Monnam(mtmp)); @@ -1796,7 +1796,7 @@ m_move(register struct monst *mtmp, int after) pline("%s eats through the iron bars.", Monnam(mtmp)); dissolve_bars(mtmp->mx, mtmp->my); return MMOVE_DONE; - } else if (Verbose(2, m_move5) && canseemon(mtmp)) + } else if (flags.verbose && canseemon(mtmp)) Norep("%s %s %s the iron bars.", Monnam(mtmp), /* pluralization fakes verb conjugation */ makeplural(locomotion(ptr, "pass")), diff --git a/src/mthrowu.c b/src/mthrowu.c index a0e07c0c6..efe8411db 100644 --- a/src/mthrowu.c +++ b/src/mthrowu.c @@ -102,7 +102,7 @@ thitu( if (u.uac + tlev <= (dieroll = rnd(20))) { ++gm.mesg_given; - if (Blind || !Verbose(2, thitu1)) { + if (Blind || !flags.verbose) { pline("It misses."); } else if (u.uac + tlev <= dieroll - 2) { if (onm != onmbuf) @@ -112,7 +112,7 @@ thitu( You("are almost hit by %s.", onm); return 0; } else { - if (Blind || !Verbose(2, thitu2)) + if (Blind || !flags.verbose) You("are hit%s", exclam(dam)); else You("are hit by %s%s", onm, exclam(dam)); @@ -596,7 +596,7 @@ m_throw( clear_dknown(singleobj); /* singleobj->dknown = 0; */ if ((singleobj->cursed || singleobj->greased) && (dx || dy) && !rn2(7)) { - if (canseemon(mon) && Verbose(2, m_throw)) { + if (canseemon(mon) && flags.verbose) { if (is_ammo(singleobj)) pline("%s misfires!", Monnam(mon)); else diff --git a/src/options.c b/src/options.c index b6f5841f9..2d0a86a48 100644 --- a/src/options.c +++ b/src/options.c @@ -5215,7 +5215,7 @@ handler_menustyle(void) } destroy_nhwindow(tmpwin); chngd = (flags.menu_style != old_menu_style); - if (chngd || Verbose(2, handler_menustyle)) + if (chngd || flags.verbose) pline("'menustyle' %s \"%s\".", chngd ? "changed to" : "is still", menutype[(int) flags.menu_style][0]); return optn_ok; @@ -5302,7 +5302,7 @@ handler_autounlock(int optidx) } destroy_nhwindow(tmpwin); chngd = (flags.autounlock != oldflags); - if ((chngd || Verbose(2, handler_autounlock)) && give_opt_msg) { + if ((chngd || flags.verbose) && give_opt_msg) { optfn_autounlock(optidx, get_val, FALSE, buf, (char *) NULL); pline("'%s' %s '%s'.", optname, chngd ? "changed to" : "is still", buf); @@ -5477,7 +5477,7 @@ handler_msg_window(void) } destroy_nhwindow(tmpwin); chngd = (iflags.prevmsg_window != old_prevmsg_window); - if (chngd || Verbose(2, handler_msg_window)) { + if (chngd || flags.verbose) { (void) optfn_msg_window(opt_msg_window, get_val, FALSE, buf, empty_optstr); pline("'msg_window' %.20s \"%.20s\".", @@ -5759,8 +5759,7 @@ handler_whatis_coord(void) "", MENU_ITEMFLAGS_NONE); Sprintf(buf, "map: upper-left: <%d,%d>, lower-right: <%d,%d>%s", 1, 0, COLNO - 1, ROWNO - 1, - Verbose(2, handler_whatis_coord1) - ? "; column 0 unused, off left edge" : ""); + flags.verbose ? "; column 0 unused, off left edge" : ""); add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE, clr, buf, MENU_ITEMFLAGS_NONE); if (strcmp(windowprocs.name, "tty")) /* only show for non-tty */ @@ -5768,8 +5767,7 @@ handler_whatis_coord(void) "screen: row is offset to accommodate tty interface's use of top line", MENU_ITEMFLAGS_NONE); #if COLNO == 80 -#define COL80ARG \ - (Verbose(2, handler_whatis_coord2) ? "; column 80 is not used" : "") +#define COL80ARG flags.verbose ? "; column 80 is not used" : "" #else #define COL80ARG "" #endif diff --git a/src/pager.c b/src/pager.c index 40f80e410..9be576708 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1716,7 +1716,7 @@ do_look(int mode, coord *click_cc) if (from_screen || clicklook) { if (from_screen) { - if (Verbose(2, dolook)) + if (flags.verbose) pline("Please move the cursor to %s.", what_is_an_unknown_object); else diff --git a/src/pickup.c b/src/pickup.c index 6148d68ef..ea2f94509 100644 --- a/src/pickup.c +++ b/src/pickup.c @@ -368,7 +368,7 @@ describe_decor(void) if (strcmp(dfeature, "swamp") && ltyp != ICE) dfeature = an(dfeature); - if (Verbose(2, describe_decor1)) { + if (flags.verbose) { Sprintf(outbuf, "There is %s here.", dfeature); } else { if (dfeature != fbuf) @@ -391,7 +391,7 @@ describe_decor(void) if (!strcmpi(surf, "floor") || !strcmpi(surf, "ground")) surf = "solid ground"; pline("%s %s %s.", - Verbose(2, describe_decor2) ? "You are back" : "Back", + flags.verbose ? "You are back" : "Back", (Levitation || Flying) ? "over" : "on", surf); } @@ -2340,7 +2340,7 @@ loot_mon(struct monst *mtmp, int *passed_info, boolean *prev_loot) return 1; } extract_from_minvent(mtmp, otmp, TRUE, FALSE); - if (Verbose(2, loot_mon)) + if (flags.verbose) You("take %s off of %s.", thesimpleoname(otmp), mon_nam(mtmp)); otmp = hold_another_object(otmp, "You drop %s!", doname(otmp), @@ -3388,8 +3388,7 @@ dotip(void) && (!iflags.menu_requested || (flags.menu_style == MENU_TRADITIONAL && boxes > 1))) { Sprintf(buf, "You can't tip %s while carrying so much.", - !Verbose(2, dotip) - ? "a container" : (boxes > 1) ? "one" : "it"); + !flags.verbose ? "a container" : (boxes > 1) ? "one" : "it"); if (!check_capacity(buf) && able_to_loot(cc.x, cc.y, FALSE)) { if (boxes > 1) { /* use menu to pick a container to tip */ diff --git a/src/potion.c b/src/potion.c index 9b77d7593..f8792e5ea 100644 --- a/src/potion.c +++ b/src/potion.c @@ -489,7 +489,7 @@ ghost_from_bottle(void) } pline("As you open the bottle, an enormous %s emerges!", Hallucination ? rndmonnam(NULL) : (const char *) "ghost"); - if (Verbose(3, ghost_from_bottle)) + if (flags.verbose) You("are frightened to death, and unable to move."); nomul(-3); gm.multi_reason = "being frightened to death"; @@ -2253,7 +2253,7 @@ dodip(void) ; /* can't dip something into fountain or pool if can't reach */ } else if (IS_FOUNTAIN(here)) { Snprintf(qbuf, sizeof(qbuf), "%s%s into the fountain?", Dip_, - Verbose(3, dodip1) ? obuf : shortestname); + flags.verbose ? obuf : shortestname); /* "Dip into the fountain?" */ if (y_n(qbuf) == 'y') { obj->pickup_prev = 0; @@ -2265,7 +2265,7 @@ dodip(void) const char *pooltype = waterbody_name(u.ux, u.uy); Snprintf(qbuf, sizeof(qbuf), "%s%s into the %s?", Dip_, - Verbose(3, dodip2) ? obuf : shortestname, pooltype); + flags.verbose ? obuf : shortestname, pooltype); /* "Dip into the {pool, moat, &c}?" */ if (y_n(qbuf) == 'y') { if (Levitation) { @@ -2289,7 +2289,7 @@ dodip(void) /* "What do you want to dip into? [xyz or ?*] " */ Snprintf(qbuf, sizeof qbuf, "dip %s into", - Verbose(3, dodip3) ? obuf : shortestname); + flags.verbose ? obuf : shortestname); potion = getobj(qbuf, drink_ok, GETOBJ_NOFLAGS); if (!potion) return ECMD_CANCEL; diff --git a/src/priest.c b/src/priest.c index a7ac5573a..21350e71b 100644 --- a/src/priest.c +++ b/src/priest.c @@ -533,7 +533,7 @@ intemple(int roomno) You("sense a presence close by!"); mtmp->mpeaceful = 0; set_malign(mtmp); - if (Verbose(3, intemple)) + if (flags.verbose) You("are frightened to death, and unable to move."); nomul(-3); gm.multi_reason = "being terrified of a ghost"; diff --git a/src/read.c b/src/read.c index 95cff4ac3..cfa04c0d6 100644 --- a/src/read.c +++ b/src/read.c @@ -360,7 +360,7 @@ doread(void) /* outrumor has its own blindness check */ if (otyp == FORTUNE_COOKIE) { - if (Verbose(3, doread1)) + if (flags.verbose) You("break up the cookie and throw away the pieces."); outrumor(bcsign(scroll), BY_COOKIE); if (!Blind) @@ -387,8 +387,7 @@ doread(void) return ECMD_OK; } if (otyp == HAWAIIAN_SHIRT) { - pline("%s features %s.", - Verbose(3, doread2) ? "The design" : "It", + pline("%s features %s.", flags.verbose ? "The design" : "It", hawaiian_design(scroll, buf)); return ECMD_TIME; } @@ -401,7 +400,7 @@ doread(void) mesg = (otyp == T_SHIRT) ? tshirt_text(scroll, buf) : apron_text(scroll, buf); endpunct = ""; - if (Verbose(3, doread3)) { + if (flags.verbose) { int ln = (int) strlen(mesg); /* we will be displaying a sentence; need ending punctuation */ @@ -465,7 +464,7 @@ doread(void) if (Blind) { You("feel the embossed numbers:"); } else { - if (Verbose(3, doread4)) + if (flags.verbose) pline("It reads:"); pline("\"%s\"", scroll->oartifact @@ -480,7 +479,7 @@ doread(void) ((int) scroll->o_id % 10), (!((int) scroll->o_id % 3)), (((int) scroll->o_id * 7) % 10), - (Verbose(3, doread5) || Blind) ? "." : ""); + (flags.verbose || Blind) ? "." : ""); if (!u.uconduct.literate++) livelog_printf(LL_CONDUCT, "became literate by reading a credit card"); @@ -501,7 +500,7 @@ doread(void) You_cant(find_any_braille); return ECMD_OK; } - if (Verbose(3, doread6)) + if (flags.verbose) pline("It reads:"); Sprintf(buf, "%s", pmname(pm, NEUTRAL)); pline("\"Magic Marker(TM) %s Red Ink Marker Pen. Water Soluble.\"", @@ -514,7 +513,7 @@ doread(void) } else if (scroll->oclass == COIN_CLASS) { if (Blind) You("feel the embossed words:"); - else if (Verbose(3, doread7)) + else if (flags.verbose) You("read:"); pline("\"1 Zorkmid. 857 GUE. In Frobs We Trust.\""); if (!u.uconduct.literate++) @@ -2195,7 +2194,7 @@ drop_boulder_on_player( pline("Fortunately, you are wearing a hard helmet."); if (dmg > 2) dmg = 2; - } else if (Verbose(3, drop_boulder_on_player)) { + } else if (flags.verbose) { pline("%s does not protect you.", Yname2(uarmh)); } } @@ -2779,7 +2778,7 @@ do_genocide( * circumstances. Who's speaking? Divine pronouncements * aren't supposed to be hampered by deafness.... */ - if (Verbose(3, do_genocide)) + if (flags.verbose) pline("A thunderous voice booms through the caverns:"); SetVoice((struct monst *) 0, 0, 80, voice_deity); verbalize("No, mortal! That will not be done."); diff --git a/src/shk.c b/src/shk.c index e7223b8ee..80d940007 100644 --- a/src/shk.c +++ b/src/shk.c @@ -404,7 +404,7 @@ call_kops(struct monst *shkp, boolean nearshop) && (gm.mvitals[PM_KOP_KAPTAIN].mvflags & G_GONE)); if (!angry_guards(!!Deaf) && nokops) { - if (Verbose(3, call_kops1) && !Deaf) + if (flags.verbose && !Deaf) pline("But no one seems to respond to it."); return; } @@ -420,14 +420,14 @@ call_kops(struct monst *shkp, boolean nearshop) if (nearshop) { /* Create swarm around you, if you merely "stepped out" */ - if (Verbose(3, call_kops2)) + if (flags.verbose) pline_The("Keystone Kops appear!"); mm.x = u.ux; mm.y = u.uy; makekops(&mm); return; } - if (Verbose(3, call_kops3)) + if (flags.verbose) pline_The("Keystone Kops are after you!"); /* Create swarm near down staircase (hinders return to level) */ if (isok(sx, sy)) { diff --git a/src/steal.c b/src/steal.c index 1c2339c40..2f4476566 100644 --- a/src/steal.c +++ b/src/steal.c @@ -764,7 +764,7 @@ relobj( } /* isgd && has gold */ while ((otmp = (is_pet ? droppables(mtmp) : mtmp->minvent)) != 0) { - mdrop_obj(mtmp, otmp, is_pet && Verbose(1, relobj)); + mdrop_obj(mtmp, otmp, is_pet && flags.verbose); } if (show && cansee(omx, omy)) diff --git a/src/teleport.c b/src/teleport.c index 1f98f8b0c..cd935122f 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -518,7 +518,7 @@ teleds(coordxy nux, coordxy nuy, int teleds_flags) /* this used to take place sooner, but if a --More-- prompt was issued then the old map display was shown instead of the new one */ - if (is_teleport && Verbose(2, teleds)) + if (is_teleport && flags.verbose) You("materialize in %s location!", (nux == u.ux0 && nuy == u.uy0) ? "the same" : "a different"); /* if terrain type changes, levitation or flying might become blocked @@ -1370,9 +1370,8 @@ level_tele(void) } schedule_goto(&newlevel, UTOTYPE_NONE, (char *) 0, - Verbose(2, level_tele) - ? "You materialize on a different level!" - : (char *) 0); + flags.verbose ? "You materialize on a different level!" + : (char *) 0); #if 0 /* always wait until end of turn to change level, otherwise code * that references monsters as this call stack unwinds won't be * able to access them reliably; the do-the-change-now code here diff --git a/src/trap.c b/src/trap.c index 32b161e4e..6fd5d0028 100644 --- a/src/trap.c +++ b/src/trap.c @@ -245,13 +245,13 @@ erode_obj( } else if (!erosion_matters(otmp)) { return ER_NOTHING; } else if (!vulnerable || (otmp->oerodeproof && otmp->rknown)) { - if (Verbose(3, erode_obj1) && print && (uvictim || vismon)) + if (flags.verbose && print && (uvictim || vismon)) pline("%s %s %s not affected by %s.", uvictim ? "Your" : s_suffix(Monnam(victim)), ostr, vtense(ostr, "are"), bythe[type]); return ER_NOTHING; } else if (otmp->oerodeproof || (otmp->blessed && !rnl(4))) { - if (Verbose(3, erode_obj2) && (print || otmp->oerodeproof) + if (flags.verbose && (print || otmp->oerodeproof) && (uvictim || vismon || visobj)) pline("Somehow, %s %s %s not affected by the %s.", uvictim ? "your" @@ -336,7 +336,7 @@ erode_obj( delobj(otmp); return ER_DESTROYED; } else { - if (Verbose(3, erode_obj3) && print) { + if (flags.verbose && print) { if (uvictim) Your("%s %s completely %s.", ostr, vtense(ostr, Blind ? "feel" : "look"), msg[type]); @@ -1213,7 +1213,7 @@ trapeffect_rocktrap( } else if (hard_helmet(uarmh)) { pline("Fortunately, you are wearing a hard helmet."); dmg = 2; - } else if (Verbose(3, trapeffect_rocktrap)) { + } else if (flags.verbose) { pline("%s does not protect you.", Yname2(uarmh)); } } else if (passes_rocks(gy.youmonst.data)) { @@ -3946,7 +3946,7 @@ climb_pit(void) pitname); fill_pit(u.ux, u.uy); gv.vision_full_recalc = 1; /* vision limits change */ - } else if (u.dz || Verbose(3, climb_pit)) { + } else if (u.dz || flags.verbose) { /* these should use 'pitname' rather than "pit" for hallucination but that would nullify Norep (this message can be repeated many times without further user intervention by using a run @@ -4789,7 +4789,7 @@ drown(void) if (Amphibious || Breathless || Swimming) { if (Amphibious || Breathless) { - if (Verbose(3, drown)) + if (flags.verbose) pline("But you aren't drowning."); if (!Is_waterlevel(&u.uz)) { if (Hallucination) diff --git a/src/uhitm.c b/src/uhitm.c index 911f16171..636a87b70 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -523,7 +523,7 @@ do_attack(struct monst *mtmp) if (gu.unweapon) { gu.unweapon = FALSE; - if (Verbose(4, do_attack)) { + if (flags.verbose) { if (uwep) You("begin bashing monsters with %s.", yname(uwep)); else if (!cantwield(gy.youmonst.data)) @@ -587,7 +587,7 @@ known_hitum( if (go.override_confirmation) { /* this may need to be generalized if weapons other than Stormbringer acquire similar anti-social behavior... */ - if (Verbose(4, known_hitum)) + if (flags.verbose) Your("bloodthirsty blade attacks!"); } @@ -1550,7 +1550,7 @@ hmon_hitmon_splitmon( if ((mclone = clone_mon(mon, 0, 0)) != 0) { withwhat[0] = '\0'; - if (u.twoweap && Verbose(4, hmon_hitmon1)) + if (u.twoweap && flags.verbose) Sprintf(withwhat, " with %s", yname(obj)); pline("%s divides as you hit it%s!", Monnam(mon), withwhat); hmd->hittxt = TRUE; @@ -1571,7 +1571,7 @@ hmon_hitmon_msg_hit( && gm.m_shot.o == obj->otyp))) { if (hmd->thrown) hit(mshot_xname(obj), mon, exclam(hmd->dmg)); - else if (!Verbose(4, hmon_hitmon2)) + else if (!flags.verbose) You("hit it."); else /* hand_to_hand */ You("%s %s%s", @@ -2771,7 +2771,7 @@ mhitm_ad_tlpt( if (!mhitm_mgc_atk_negated(magr, mdef, FALSE)) { You("are not affected."); } else { - if (Verbose(4, mhitm_ad_tlpt)) + if (flags.verbose) Your("position suddenly seems %suncertain!", (Teleport_control && !Stunned && !unconscious()) ? "" : "very "); @@ -3230,7 +3230,7 @@ mhitm_ad_wrap( pline("%s is being crushed.", Monnam(mdef)); } else { mhm->damage = 0; - if (Verbose(4, mhitm_ad_wrap1)) { + if (flags.verbose) { if (coil && !tailmiss) You("brush against %s.", mon_nam(mdef)); else @@ -3271,7 +3271,7 @@ mhitm_ad_wrap( } } else { mhm->damage = 0; - if (Verbose(4, mhitm_ad_wrap2)) { + if (flags.verbose) { if (coil) pline("%s brushes against you.", Monnam(magr)); else @@ -4360,7 +4360,7 @@ mhitm_ad_dgst( mhm->done = TRUE; return; } - if (Verbose(4, mhitm_ad_dgst) && !Deaf) { + if (flags.verbose && !Deaf) { /* Soundeffect? */ SetVoice(magr, 0, 80, 0); verbalize("Burrrrp!"); @@ -4702,7 +4702,7 @@ damageum( You_feel("embarrassed for a moment."); if (mhm.damage) xkilled(mdef, XKILL_NOMSG); - } else if (!Verbose(4, damageum)) { + } else if (!flags.verbose) { You("destroy it!"); if (mhm.damage) xkilled(mdef, XKILL_NOMSG); @@ -5035,7 +5035,7 @@ missum( if (could_seduce(&gy.youmonst, mdef, mattk)) You("pretend to be friendly to %s.", mon_nam(mdef)); - else if (canspotmon(mdef) && Verbose(4, missum)) + else if (canspotmon(mdef) && flags.verbose) You("miss %s.", mon_nam(mdef)); else You("miss it."); @@ -5444,7 +5444,7 @@ hmonas(struct monst *mon) if (mattk->aatyp == AT_CLAW) verb = "hit"; /* not "claws" */ You("%s %s.", verb, mon_nam(mon)); - if (silverhit && Verbose(4, hmonas1)) + if (silverhit && flags.verbose) silver_sears(&gy.youmonst, mon, silverhit); } sum[i] = damageum(mon, mattk, specialdmg); @@ -5508,7 +5508,7 @@ hmonas(struct monst *mon) choking hug; deals damage but never grabs hold */ if (specialdmg) { You("%s %s%s", verb, mon_nam(mon), exclam(specialdmg)); - if (silverhit && Verbose(4, hmonas2)) + if (silverhit && flags.verbose) silver_sears(&gy.youmonst, mon, silverhit); sum[i] = damageum(mon, mattk, specialdmg); } else { @@ -5526,7 +5526,7 @@ hmonas(struct monst *mon) byhand ? "throttled" : "crushed", /* extra feedback for non-breather being choked */ unconcerned ? " but doesn't seem concerned" : ""); - if (silverhit && Verbose(4, hmonas3)) + if (silverhit && flags.verbose) silver_sears(&gy.youmonst, mon, silverhit); sum[i] = damageum(mon, mattk, specialdmg); } else if (i >= 2 && (sum[i - 1] > M_ATTK_MISS) @@ -5538,7 +5538,7 @@ hmonas(struct monst *mon) uunstick(); You("grab %s!", mon_nam(mon)); set_ustuck(mon); - if (silverhit && Verbose(4, hmonas4)) + if (silverhit && flags.verbose) silver_sears(&gy.youmonst, mon, silverhit); sum[i] = damageum(mon, mattk, specialdmg); } @@ -5690,7 +5690,7 @@ passive( break; case AD_ACID: if (mhitb && rn2(2)) { - if (Blind || !Verbose(4, passive)) + if (Blind || !flags.verbose) You("are splashed!"); else You("are splashed by %s %s!", s_suffix(mon_nam(mon)), @@ -6091,7 +6091,7 @@ flash_hits_mon(struct monst *mtmp, mtmp->mcansee = 0; mtmp->mblinded = (tmp < 3) ? 0 : rnd(1 + 50 / tmp); } - } else if (Verbose(4, flash_hits_mon) && useeit) { + } else if (flags.verbose && useeit) { if (lev->lit) pline("The flash of light shines on %s.", mon_nam(mtmp)); else diff --git a/src/wield.c b/src/wield.c index c32a11489..c6da6787b 100644 --- a/src/wield.c +++ b/src/wield.c @@ -220,7 +220,7 @@ ready_weapon(struct obj *wep) } setuwep(wep); - if (was_twoweap && !u.twoweap && Verbose(1, ready_weapon)) { + if (was_twoweap && !u.twoweap && flags.verbose) { /* skip this message if we already got "empty handed" one above; also, Null is not safe for neither TWOWEAPOK() or bimanual() */ if (uwep) @@ -687,7 +687,7 @@ wield_tool(struct obj *obj, return FALSE; } if (welded(uwep)) { - if (Verbose(1, wield_tool)) { + if (flags.verbose) { const char *hand = body_part(HAND); if (bimanual(uwep)) diff --git a/src/worn.c b/src/worn.c index 96ba2ddd2..392cdead0 100644 --- a/src/worn.c +++ b/src/worn.c @@ -327,7 +327,7 @@ mon_adjust_speed( if (petrify) { /* mimic the player's petrification countdown; "slowing down" even if fast movement rate retained via worn speed boots */ - if (Verbose(3, mon_adjust_speed)) + if (flags.verbose) pline("%s is slowing down.", Monnam(mon)); } else if (adjust > 0 || mon->mspeed == MFAST) pline("%s is suddenly moving %sfaster.", Monnam(mon), howmuch); diff --git a/src/zap.c b/src/zap.c index 0af692c5e..dbc1a1d0d 100644 --- a/src/zap.c +++ b/src/zap.c @@ -3433,7 +3433,7 @@ hit(const char *str, /* zap text or missile name */ const char *force) /* usually either "." or "!" via exclam() */ { boolean verbosely = (mtmp == &gy.youmonst - || (Verbose(3, hit) + || (flags.verbose && (cansee(gb.bhitpos.x, gb.bhitpos.y) || canspotmon(mtmp) || engulfing_u(mtmp)))); @@ -3449,7 +3449,7 @@ miss(const char *str, struct monst *mtmp) { pline("%s %s %s.", The(str), vtense(str, "miss"), ((cansee(gb.bhitpos.x, gb.bhitpos.y) || canspotmon(mtmp)) - && Verbose(3, miss)) ? mon_nam(mtmp) : "it"); + && flags.verbose) ? mon_nam(mtmp) : "it"); } static void @@ -5965,7 +5965,7 @@ makewish(void) promptbuf[0] = '\0'; nothing = cg.zeroobj; /* lint suppression; only its address matters */ - if (Verbose(3, makewish)) + if (flags.verbose) You("may wish for an object."); retry: Strcpy(promptbuf, "For what do you wish");