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

more warning quiet

Browse Source
This commit is contained in:
nhmall
2018-11-25 14:16:22 -05:00
parent 5c27a36936
commit 457d3a0d26
1 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/pager.c
View File

@@ -1340,88 +1340,88 @@ boolean do_mons; /* True => monsters, False => objects */
destroy_nhwindow(win); destroy_nhwindow(win);
} }
static const char *suptext1[] = {
"%s is a member of a marauding horde of orcs",
"rumored to have brutally attacked and plundered",
"the ordinarily sheltered town that is located ",
"deep within The Gnomish Mines.",
"",
"The members of that vicious horde proudly and ",
"defiantly acclaim their allegiance to their",
"leader %s in their names.",
(char *) 0,
};
static const char *suptext2[] = {
"%s is a nefarious orc who is known to acquire",
"property from thieves and sell it off for profit",
"or gain. The perpetrator was last seen hanging",
"around the stairs leading to the Gnomish Mines.",
(char *) 0,
};
void void
do_supplemental_info(name, pm, without_asking) do_supplemental_info(name, pm, without_asking)
char *name; char *name;
struct permonst *pm; struct permonst *pm;
boolean without_asking; boolean without_asking;
{ {
int textidx = 0; const char **textp;
winid datawin = WIN_ERR; winid datawin = WIN_ERR;
char *entrytext = name, *bp = (char *) 0, *bp2 = (char *) 0; char *entrytext = name, *bp = (char *) 0, *bp2 = (char *) 0;
char question[QBUFSZ]; char question[QBUFSZ];
boolean yes_to_moreinfo = FALSE; boolean yes_to_moreinfo = FALSE;
boolean is_marauder = (name && pm && is_orc(pm));
/* /*
* Provide some info on some specific things * Provide some info on some specific things
* meant to support in-game mythology, and not * meant to support in-game mythology, and not
* available from data.base or other sources. * available from data.base or other sources.
*/ */
if ((name && pm && is_orc(pm) && (strlen(name) < (BUFSZ - 1))) if (is_marauder && (strlen(name) < (BUFSZ - 1))) {
&& ((bp = strstri(name, " of ")) != 0) ||
(bp2 = strstri(name, " the Fence")) != 0) {
char fullname[BUFSZ]; char fullname[BUFSZ];
Strcpy(fullname, name); bp = strstri(name, " of ");
if (!without_asking) { bp2 = strstri(name, " the Fence");
Strcpy(question, "More info about \"");
/* +2 => length of "\"?" */
copynchars(eos(question), entrytext,
(int) (sizeof question - 1 - (strlen(question) + 2)));
Strcat(question, "\"?");
if (yn(question) == 'y')
yes_to_moreinfo = TRUE;
}
if (yes_to_moreinfo) {
int i, subs = 0;
char *gang = (char *) 0;
if (bp) if (bp || bp2) {
textidx = 0; Strcpy(fullname, name);
else if (!without_asking) {
textidx = 1; Strcpy(question, "More info about \"");
/* +2 => length of "\"?" */
copynchars(eos(question), entrytext,
(int) (sizeof question - 1 - (strlen(question) + 2)));
Strcat(question, "\"?");
if (yn(question) == 'y')
yes_to_moreinfo = TRUE;
}
if (yes_to_moreinfo) {
int i, subs = 0;
char *gang = (char *) 0;
static const char *text[2][6] = { if (bp) {
{ textp = suptext1;
"%s is a member of a marauding horde of orcs", gang = bp + 4;
"rumored to have brutally attacked and plundered the ordinarily", *bp = '\0';
"sheltered town that is located deep within The Gnomish Mines.", } else {
"", textp = suptext2;
"The members of that vicious horde proudly and defiantly acclaim", gang = "";
"their allegiance to their leader %s in their names.", }
}, datawin = create_nhwindow(NHW_MENU);
{ for (i = 0; textp[i]; i++) {
"%s is a nefarious orc who is known to acquire property", char buf[BUFSZ];
"from thieves and sell it off for profit or gain.", const char *txt;
"The perpetrator was last seen hanging around the stairs leading",
"to the Gnomish Mines.", if (strstri(textp[i], "%s") != 0) {
"", Sprintf(buf, textp[i], subs++ ? gang : fullname);
"", txt = buf;
} else
txt = textp[i];
putstr(datawin, 0, txt);
} }
}; display_nhwindow(datawin, FALSE);
destroy_nhwindow(datawin), datawin = WIN_ERR;
if (bp) {
gang = bp + 4;
*bp = '\0';
} else {
gang = "";
} }
datawin = create_nhwindow(NHW_MENU);
for (i = 0; i < SIZE(text[textidx]); i++) {
char buf[BUFSZ];
const char *txt;
if (strstri(text[textidx][i], "%s") != 0) {
Sprintf(buf, text[textidx][i],
subs++ ? gang : fullname);
txt = buf;
} else
txt = text[textidx][i];
putstr(datawin, 0, txt);
}
display_nhwindow(datawin, FALSE);
destroy_nhwindow(datawin), datawin = WIN_ERR;
} }
} }
} }