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

updates for 3.6 March 2020

Browse Source
This commit is contained in:
nhmall
2020-03-04 10:41:57 -05:00
parent 1e5fd608bf
commit abdd3254ae
34 changed files with 109 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/objnam.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 objnam.c $NHDT-Date: 1576638500 2019/12/18 03:08:20 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.257 $ */
/* NetHack 3.6 objnam.c $NHDT-Date: 1583315888 2020/03/04 09:58:08 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.293 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1368,7 +1368,8 @@ struct obj *otmp;
const char *adjective;
unsigned cxn_flags; /* bitmask of CXN_xxx values */
{
char *nambuf = nextobuf();
/* some callers [aobjnam()] rely on prefix area that xname() sets aside */
char *nambuf = nextobuf() + PREFIX;
int omndx = otmp->corpsenm;
boolean ignore_quan = (cxn_flags & CXN_SINGULAR) != 0,
/* suppress "the" from "the unique monster corpse" */
@@ -1519,8 +1520,7 @@ struct obj *obj;
/* format the object */
if (obj->otyp == CORPSE) {
buf = nextobuf();
Strcpy(buf, corpse_xname(obj, (const char *) 0, CXN_NORMAL));
buf = corpse_xname(obj, (const char *) 0, CXN_NORMAL);
} else if (obj->otyp == SLIME_MOLD) {
/* concession to "most unique deaths competition" in the annual
devnull tournament, suppress player supplied fruit names because

10
src/options.c
View File

@@ -1422,11 +1422,13 @@ char *str;
c = colornames[i].color;
break;
}
if (i == SIZE(colornames) && (*str >= '0' && *str <= '9'))
if (i == SIZE(colornames) && digit(*str))
c = atoi(str);
if (c == CLR_MAX)
config_error_add("Unknown color '%s'", str);
if (c < 0 || c >= CLR_MAX) {
config_error_add("Unknown color '%.60s'", str);
c = CLR_MAX; /* "none of the above" */
}
return c;
}
@@ -1458,7 +1460,7 @@ boolean complain;
}
if (a == -1 && complain)
config_error_add("Unknown text attribute '%s'", str);
config_error_add("Unknown text attribute '%.50s'", str);
return a;
}