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

mouse_support compile bits

Browse Source 
There was a spurious seli-colon after an if's test, making a boundary
check be ineffective.  When looking at that, I noticed that the 'O'
command's display of the current value for mouse_support ("0=off" and
so forth) was relying on implicit concatenation of adjacent string
literals, which would break K&R compilation.  Do that concatenation
the old fashioned way....

While testing (after temporarily adding WC_MOUSE_SUPPORT to tty's
window_procs), I also noticed that wording used by config_error_add
looked strange when it was in response to giving a bad value via 'O'
command.  Suppress its "config_error_add: " prefix is that situation.
This commit is contained in:
PatR
2018-11-28 01:02:44 -08:00
parent 478b53b4c2
commit 98afe5541d
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files.c
+4 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 files.c $NHDT-Date: 1542765358 2018/11/21 01:55:58 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.243 $ */ /* NetHack 3.6 files.c $NHDT-Date: 1543395733 2018/11/28 09:02:13 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.244 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2797,8 +2797,9 @@ const char *buf;
buf = "Unknown error"; buf = "Unknown error";
if (!config_error_data) { if (!config_error_data) {
/* assumes pline() is using raw_printf() as this stage */ /* either very early, where pline() will use raw_print(), or
pline("config_error_add: %s.", buf); player gave bad value when prompted by interactive 'O' command */
pline("%s%s.", !iflags.window_inited ? "config_error_add: " : "", buf);
wait_synch(); wait_synch();
return; return;
} }
src/options.c
+16 -15
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1526112322 2018/05/12 08:05:22 $ $NHDT-Branch: master $:$NHDT-Revision: 1.323 $ */ /* NetHack 3.6 options.c $NHDT-Date: 1543395749 2018/11/28 09:02:29 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.334 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */ /*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2227,7 +2227,7 @@ boolean tinitial, tfrom_file;
if (mode < 0 || mode > 2 || (mode == 0 && *op != '0')) { if (mode < 0 || mode > 2 || (mode == 0 && *op != '0')) {
config_error_add("Illegal %s parameter '%s'", fullname, op); config_error_add("Illegal %s parameter '%s'", fullname, op);
return FALSE; return FALSE;
} else { /* mode > 0 */ } else { /* mode >= 0 */
iflags.wc_mouse_support = mode; iflags.wc_mouse_support = mode;
} }
} }
@@ -2288,8 +2288,9 @@ boolean tinitial, tfrom_file;
symset[ROGUESET].name = dupstr(op); symset[ROGUESET].name = dupstr(op);
if (!read_sym_file(ROGUESET)) { if (!read_sym_file(ROGUESET)) {
clear_symsetentry(ROGUESET, TRUE); clear_symsetentry(ROGUESET, TRUE);
config_error_add("Unable to load symbol set \"%s\" from \"%s\"", config_error_add(
op, SYMBOLS); "Unable to load symbol set \"%s\" from \"%s\"",
op, SYMBOLS);
return FALSE; return FALSE;
} else { } else {
if (!initial && Is_rogue_level(&u.uz)) if (!initial && Is_rogue_level(&u.uz))
@@ -5363,10 +5364,10 @@ get_compopt_value(optname, buf)
const char *optname; const char *optname;
char *buf; char *buf;
{ {
char ocl[MAXOCLASSES + 1];
static const char none[] = "(none)", randomrole[] = "random", static const char none[] = "(none)", randomrole[] = "random",
to_be_done[] = "(to be done)", defopt[] = "default", to_be_done[] = "(to be done)",
defbrief[] = "def"; defopt[] = "default", defbrief[] = "def";
char ocl[MAXOCLASSES + 1];
int i; int i;
buf[0] = '\0'; buf[0] = '\0';
@@ -5529,17 +5530,17 @@ char *buf;
#define MOUSEFIX1 ", O/S adjusted" #define MOUSEFIX1 ", O/S adjusted"
#define MOUSEFIX2 ", O/S unchanged" #define MOUSEFIX2 ", O/S unchanged"
#endif #endif
int ms = iflags.wc_mouse_support; static const char *mousemodes[][2] = {
static const char *mousemodes[] = { { "0=off", "" },
"0=off", { "1=on", MOUSEFIX1 },
"1=on" MOUSEFIX1, { "2=on", MOUSEFIX2 },
"2=on" MOUSEFIX2,
}; };
if (ms >= 0 && ms < SIZE(mousemodes));
Strcpy(buf, mousemodes[ms]);
#undef MOUSEFIX1 #undef MOUSEFIX1
#undef MOUSEFIX2 #undef MOUSEFIX2
int ms = iflags.wc_mouse_support;
if (ms >= 0 && ms <= 2)
Sprintf(buf, "%s%s", mousemodes[ms][0], mousemodes[ms][1]);
} else if (!strcmp(optname, "number_pad")) { } else if (!strcmp(optname, "number_pad")) {
static const char *numpadmodes[] = { static const char *numpadmodes[] = {
"0=off", "1=on", "2=on, MSDOS compatible", "0=off", "1=on", "2=on, MSDOS compatible",