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

granular verbose message suppression mechanics

Browse Source 
Switch to using a macro invocation Verbos(n, s) in place of the
flags.verbose checks.

Provide the mechanics for individual suppression of any of the
existing messages that were considered verbose.

Mechanics only - this code update does not provide any means of
setting the suppression bits.

iflags.verbose = 0
is still a master suppression of all the verbose messages.

iflags.verbose = 1
turns on the verbose messages only for those whose suppression
bit is 0 (not set).
This commit is contained in:
nhmall
2022-06-09 13:53:20 -04:00
parent fe235b7292
commit be76727265
41 changed files with 312 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/hack.c
View File

@@ -262,7 +262,7 @@ moverock(void)
deliver_part1 = TRUE;
map_invisible(rx, ry);
}
if (flags.verbose) {
if (Verbose(1, moverock)) {
char you_or_steed[BUFSZ];
Strcpy(you_or_steed,
@@ -568,7 +568,7 @@ still_chewing(xchar x, xchar y)
watch_dig((struct monst *) 0, x, y, FALSE);
return 1;
} else if ((g.context.digging.effort += (30 + u.udaminc)) <= 100) {
if (flags.verbose)
if (Verbose(1, still_chewing))
You("%s chewing on the %s.",
g.context.digging.chew ? "continue" : "begin",
boulder
@@ -1395,7 +1395,7 @@ trapmove(int x, int y, /* targetted destination, <u.ux+u.dx,u.uy+u.dy> */
switch (u.utraptype) {
case TT_BEARTRAP:
if (flags.verbose) {
if (Verbose(1, trapmove1)) {
predicament = "caught in a bear trap";
if (u.usteed)
Norep("%s is %s.", upstart(steedname), predicament);
@@ -1423,7 +1423,7 @@ trapmove(int x, int y, /* targetted destination, <u.ux+u.dx,u.uy+u.dy> */
break;
}
if (--u.utrap) {
if (flags.verbose) {
if (Verbose(1, trapmove2)) {
predicament = "stuck to the web";
if (u.usteed)
Norep("%s is %s.", upstart(steedname), predicament);
@@ -1438,7 +1438,7 @@ trapmove(int x, int y, /* targetted destination, <u.ux+u.dx,u.uy+u.dy> */
}
break;
case TT_LAVA:
if (flags.verbose) {
if (Verbose(1, trapmove3)) {
predicament = "stuck in the lava";
if (u.usteed)
Norep("%s is %s.", upstart(steedname), predicament);
@@ -1474,13 +1474,13 @@ trapmove(int x, int y, /* targetted destination, <u.ux+u.dx,u.uy+u.dy> */
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 (flags.verbose)
if (Verbose(1, trapmove4))
Norep("You move within the chain's reach.");
return TRUE;
}
}
if (--u.utrap) {
if (flags.verbose) {
if (Verbose(1, trapmove5)) {
if (anchored) {
predicament = "chained to the";
culprit = "buried ball";