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

Reading a magic marker shows the specific red ink color

Browse Source
This commit is contained in:
Pasi Kallinen
2022-02-19 13:11:20 +02:00
parent c434236f1e
commit 26ea5824c1
4 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/hacklib.c
View File

@@ -18,6 +18,7 @@
char * lcase (char *)
char * ucase (char *)
char * upstart (char *)
char * upwords (char *)
char * mungspaces (char *)
char * trimspaces (char *)
char * strip_newline (char *)
@@ -147,6 +148,25 @@ upstart(char *s)
return s;
}
/* capitalize first letter of every word in a string (in place) */
char *
upwords(char *s)
{
char *p;
boolean space = TRUE;
for (p = s; *p; p++)
if (*p == ' ') {
space = TRUE;
} else if (space && letter(*p)) {
*p = highc(*p);
space = FALSE;
} else {
space = FALSE;
}
return s;
}
/* remove excess whitespace from a string buffer (in place) */
char *
mungspaces(char *bp)

11
src/read.c
View File

@@ -489,13 +489,22 @@ doread(void)
pline("This %s has no label.", singular(scroll, xname));
return ECMD_OK;
} else if (otyp == MAGIC_MARKER) {
char buf[BUFSZ];
const int red_mons[] = { PM_FIRE_ANT, PM_PYROLISK, PM_HELL_HOUND,
PM_IMP, PM_LARGE_MIMIC, PM_LEOCROTTA, PM_SCORPION, PM_XAN,
PM_GIANT_BAT, PM_WATER_MOCCASIN, PM_FLESH_GOLEM, PM_BARBED_DEVIL,
PM_MARILITH, PM_PIRANHA };
struct permonst *pm = &mons[red_mons[scroll->o_id % SIZE(red_mons)]];
if (Blind) {
You_cant(find_any_braille);
return ECMD_OK;
}
if (flags.verbose)
pline("It reads:");
pline("\"Magic Marker(TM) Red Ink Marker Pen. Water Soluble.\"");
Sprintf(buf, "%s", pmname(pm, NEUTRAL));
pline("\"Magic Marker(TM) %s Red Ink Marker Pen. Water Soluble.\"",
upwords(buf));
if (!u.uconduct.literate++)
livelog_printf(LL_CONDUCT,
"became literate by reading a magic marker");