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

options fixes

Browse Source 
Several boolean options were mis-categorized and became
unsettable during play.  Also, the eight_bit_tty option got
dropped into limbo.  Fixing that revealed a typo which would
have broken compilation for MSDOS.

     `eight_bit_tty' has been renamed `wc_eight_bit_input',
but its only use anywhere in the code is for output.
This commit is contained in:
nethack.rankin
2002-02-06 01:36:31 +00:00
parent 02e2c671ed
commit fec866a08c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+6 -6
View File
@@ -61,7 +61,7 @@ static struct Bool_Opt
{"BIOS", (boolean *)0, FALSE, SET_IN_FILE}, {"BIOS", (boolean *)0, FALSE, SET_IN_FILE},
#endif #endif
#ifdef INSURANCE #ifdef INSURANCE
{"checkpoint", &flags.ins_chkpt, TRUE, DISP_IN_GAME}, {"checkpoint", &flags.ins_chkpt, TRUE, SET_IN_GAME},
#else #else
{"checkpoint", (boolean *)0, FALSE, SET_IN_FILE}, {"checkpoint", (boolean *)0, FALSE, SET_IN_FILE},
#endif #endif
@@ -77,11 +77,11 @@ static struct Bool_Opt
# endif # endif
{"confirm",&flags.confirm, TRUE, SET_IN_GAME}, {"confirm",&flags.confirm, TRUE, SET_IN_GAME},
#ifdef TERMLIB #ifdef TERMLIB
{"DECgraphics", &iflags.DECgraphics, FALSE, DISP_IN_GAME}, {"DECgraphics", &iflags.DECgraphics, FALSE, SET_IN_GAME},
#else #else
{"DECgraphics", (boolean *)0, FALSE, SET_IN_FILE}, {"DECgraphics", (boolean *)0, FALSE, SET_IN_FILE},
#endif #endif
{"eight_bit_tty", &iflags.wc_eight_bit_input, FALSE, DISP_IN_GAME}, /*WC*/ {"eight_bit_tty", &iflags.wc_eight_bit_input, FALSE, SET_IN_GAME}, /*WC*/
#ifdef TTY_GRAPHICS #ifdef TTY_GRAPHICS
{"extmenu", &iflags.extmenu, FALSE, SET_IN_GAME}, {"extmenu", &iflags.extmenu, FALSE, SET_IN_GAME},
#else #else
@@ -93,7 +93,7 @@ static struct Bool_Opt
{"fast_map", (boolean *)0, TRUE, SET_IN_FILE}, {"fast_map", (boolean *)0, TRUE, SET_IN_FILE},
#endif #endif
{"female", &flags.female, FALSE, DISP_IN_GAME}, {"female", &flags.female, FALSE, DISP_IN_GAME},
{"fixinv", &flags.invlet_constant, TRUE, DISP_IN_GAME}, {"fixinv", &flags.invlet_constant, TRUE, SET_IN_GAME},
#ifdef AMIFLUSH #ifdef AMIFLUSH
{"flush", &flags.amiflush, FALSE, SET_IN_GAME}, {"flush", &flags.amiflush, FALSE, SET_IN_GAME},
#else #else
@@ -102,7 +102,7 @@ static struct Bool_Opt
{"help", &flags.help, TRUE, SET_IN_GAME}, {"help", &flags.help, TRUE, SET_IN_GAME},
{"hilite_pet", &iflags.wc_hilite_pet, FALSE, SET_IN_GAME}, /*WC*/ {"hilite_pet", &iflags.wc_hilite_pet, FALSE, SET_IN_GAME}, /*WC*/
#ifdef ASCIIGRAPH #ifdef ASCIIGRAPH
{"IBMgraphics", &iflags.IBMgraphics, FALSE, DISP_IN_GAME}, {"IBMgraphics", &iflags.IBMgraphics, FALSE, SET_IN_GAME},
#else #else
{"IBMgraphics", (boolean *)0, FALSE, SET_IN_FILE}, {"IBMgraphics", (boolean *)0, FALSE, SET_IN_FILE},
#endif #endif
@@ -111,7 +111,7 @@ static struct Bool_Opt
{"legacy", &flags.legacy, TRUE, DISP_IN_GAME}, {"legacy", &flags.legacy, TRUE, DISP_IN_GAME},
{"lit_corridor", &flags.lit_corridor, FALSE, SET_IN_GAME}, {"lit_corridor", &flags.lit_corridor, FALSE, SET_IN_GAME},
#ifdef MAC_GRAPHICS_ENV #ifdef MAC_GRAPHICS_ENV
{"Macgraphics", &iflags.MACgraphics, TRUE, DISP_IN_GAME}, {"Macgraphics", &iflags.MACgraphics, TRUE, SET_IN_GAME},
#else #else
{"Macgraphics", (boolean *)0, FALSE, SET_IN_FILE}, {"Macgraphics", (boolean *)0, FALSE, SET_IN_FILE},
#endif #endif
win/tty/wintty.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)wintty.c 3.4 2000/06/27 */ /* SCCS Id: @(#)wintty.c 3.4 2002/02/05 */
/* Copyright (c) David Cohrs, 1991 */ /* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -46,9 +46,9 @@ extern char mapped_menu_cmds[]; /* from options.c */
struct window_procs tty_procs = { struct window_procs tty_procs = {
"tty", "tty",
#ifdef MSDOS #ifdef MSDOS
WC_TILED_MAP|WC_TILES_16x16|WC_TILES_8x16|WC_ASCII_MAP WC_TILED_MAP|WC_TILES_16x16|WC_TILES_8x16|WC_ASCII_MAP|
#endif #endif
WC_COLOR|WC_HILITE_PET|WC_INVERSE, WC_COLOR|WC_HILITE_PET|WC_INVERSE|WC_EIGHT_BIT_IN,
tty_init_nhwindows, tty_init_nhwindows,
tty_player_selection, tty_player_selection,
tty_askname, tty_askname,