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

attempt to quiet some onefile complaints

Browse Source
This commit is contained in:
nhmall
2023-04-21 10:42:36 -04:00
parent 826ce951e7
commit b26ec2f677
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/insight.c
View File

@@ -99,15 +99,15 @@ static struct ll_achieve_msg achieve_msg [] = {
/* macros to simplify output of enlightenment messages; also used by
conduct and achievements */
#define enl_msg(prefix, present, past, suffix, ps) \
enlght_line(prefix, final ? past : present, suffix, ps)
#define you_are(attr, ps) enl_msg(You_, are, were, attr, ps)
#define you_have(attr, ps) enl_msg(You_, have, had, attr, ps)
#define you_can(attr, ps) enl_msg(You_, can, could, attr, ps)
#define you_have_been(goodthing) enl_msg(You_, have_been, were, goodthing, "")
enlght_line((prefix), final ? (past) : (present), (suffix), (ps))
#define you_are(attr, ps) enl_msg(You_, are, were, (attr), (ps))
#define you_have(attr, ps) enl_msg(You_, have, had, (attr), (ps))
#define you_can(attr, ps) enl_msg(You_, can, could, (attr), (ps))
#define you_have_been(goodthing) enl_msg(You_, have_been, were, (goodthing), "")
#define you_have_never(badthing) \
enl_msg(You_, have_never, never, badthing, "")
enl_msg(You_, have_never, never, (badthing), "")
#define you_have_X(something) \
enl_msg(You_, have, (const char *) "", something, "")
enl_msg(You_, have, (const char *) "", (something), "")
static void
enlght_out(const char *buf)

16
src/options.c
View File

@@ -7107,10 +7107,12 @@ parsebindings(char *bindings)
*
*/
static const struct color_names {
struct color_names {
const char *name;
int color;
} colornames[] = {
};
static const struct color_names colornames[] = {
{ "black", CLR_BLACK },
{ "red", CLR_RED },
{ "green", CLR_GREEN },
@@ -7127,7 +7129,7 @@ static const struct color_names {
{ "light cyan", CLR_BRIGHT_CYAN },
{ "white", CLR_WHITE },
{ "no color", NO_COLOR },
{ NULL, CLR_BLACK }, /* everything after this is an alias */
{ (const char *) 0, CLR_BLACK }, /* everything after this is an alias */
{ "transparent", NO_COLOR },
{ "purple", CLR_MAGENTA },
{ "light purple", CLR_BRIGHT_MAGENTA },
@@ -7140,10 +7142,12 @@ static const struct color_names {
{ "bright cyan", CLR_BRIGHT_CYAN }
};
static const struct attr_names {
struct attr_names {
const char *name;
int attr;
} attrnames[] = {
};
static const struct attr_names attrnames[] = {
{ "none", ATR_NONE },
{ "bold", ATR_BOLD },
{ "dim", ATR_DIM },
@@ -7151,7 +7155,7 @@ static const struct attr_names {
{ "underline", ATR_ULINE },
{ "blink", ATR_BLINK },
{ "inverse", ATR_INVERSE },
{ NULL, ATR_NONE }, /* everything after this is an alias */
{ (const char *) 0, ATR_NONE }, /* everything after this is an alias */
{ "normal", ATR_NONE },
{ "uline", ATR_ULINE },
{ "reverse", ATR_INVERSE },