From: nethack.rankin <nethack.rankin>
Date: Wed, 6 Feb 2002 01:36:31 +0000 (+0000)
Subject: options fixes
X-Git-Tag: MOVE2GIT~3250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fec866a08c0d5dbd28a4c6608daf257419329662;p=nethack

options fixes

     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.
---

diff --git a/src/options.c b/src/options.c
index 40f4cd812..2b6a01a3e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -61,7 +61,7 @@ static struct Bool_Opt
 	{"BIOS", (boolean *)0, FALSE, SET_IN_FILE},
 #endif
 #ifdef INSURANCE
-	{"checkpoint", &flags.ins_chkpt, TRUE, DISP_IN_GAME},
+	{"checkpoint", &flags.ins_chkpt, TRUE, SET_IN_GAME},
 #else
 	{"checkpoint", (boolean *)0, FALSE, SET_IN_FILE},
 #endif
@@ -77,11 +77,11 @@ static struct Bool_Opt
 # endif
 	{"confirm",&flags.confirm, TRUE, SET_IN_GAME},
 #ifdef TERMLIB
-	{"DECgraphics", &iflags.DECgraphics, FALSE, DISP_IN_GAME},
+	{"DECgraphics", &iflags.DECgraphics, FALSE, SET_IN_GAME},
 #else
 	{"DECgraphics", (boolean *)0, FALSE, SET_IN_FILE},
 #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
 	{"extmenu", &iflags.extmenu, FALSE, SET_IN_GAME},
 #else
@@ -93,7 +93,7 @@ static struct Bool_Opt
 	{"fast_map", (boolean *)0, TRUE, SET_IN_FILE},
 #endif
 	{"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
 	{"flush", &flags.amiflush, FALSE, SET_IN_GAME},
 #else
@@ -102,7 +102,7 @@ static struct Bool_Opt
 	{"help", &flags.help, TRUE, SET_IN_GAME},
 	{"hilite_pet",    &iflags.wc_hilite_pet, FALSE, SET_IN_GAME},	/*WC*/
 #ifdef ASCIIGRAPH
-	{"IBMgraphics", &iflags.IBMgraphics, FALSE, DISP_IN_GAME},
+	{"IBMgraphics", &iflags.IBMgraphics, FALSE, SET_IN_GAME},
 #else
 	{"IBMgraphics", (boolean *)0, FALSE, SET_IN_FILE},
 #endif
@@ -111,7 +111,7 @@ static struct Bool_Opt
 	{"legacy", &flags.legacy, TRUE, DISP_IN_GAME},
 	{"lit_corridor", &flags.lit_corridor, FALSE, SET_IN_GAME},
 #ifdef MAC_GRAPHICS_ENV
-	{"Macgraphics", &iflags.MACgraphics, TRUE, DISP_IN_GAME},
+	{"Macgraphics", &iflags.MACgraphics, TRUE, SET_IN_GAME},
 #else
 	{"Macgraphics", (boolean *)0, FALSE, SET_IN_FILE},
 #endif
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index ad115e557..671200f9a 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -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				  */
 /* 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 = {
     "tty",
 #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
-    WC_COLOR|WC_HILITE_PET|WC_INVERSE,
+    WC_COLOR|WC_HILITE_PET|WC_INVERSE|WC_EIGHT_BIT_IN,
     tty_init_nhwindows,
     tty_player_selection,
     tty_askname,