add flag to allow conditional exec of related

Changes to be committed:
	modified:   include/flag.h
	modified:   src/display.c
	modified:   src/options.c
This commit is contained in:
nhmall
2015-06-11 08:14:06 -04:00
parent 379f8abb54
commit 30db04802c
3 changed files with 12 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 flag.h $NHDT-Date: 1433983706 2015/06/11 00:48:26 $ $NHDT-Branch: master $:$NHDT-Revision: 1.86 $ */
/* NetHack 3.6 flag.h $NHDT-Date: 1434024828 2015/06/11 12:13:48 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.87 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -207,8 +207,9 @@ struct instance_flags {
boolean rlecomp; /* run-length comp of levels when writing savefile */
uchar num_pad_mode;
boolean echo; /* 1 to echo characters */
boolean use_menu_color; /* use color in menus; only if wc_color */
boolean use_status_hilites; /* use color in status */
boolean use_menu_color; /* use color in menus; only if wc_color */
boolean use_status_hilites; /* use color in status line */
boolean use_background_glyph; /* use background glyph when appropriate */
#if 0
boolean DECgraphics; /* use DEC VT-xxx extended character set */
boolean IBMgraphics; /* use IBM extended character set */

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 display.c $NHDT-Date: 1433901380 2015/06/10 01:56:20 $ $NHDT-Branch: master $:$NHDT-Revision: 1.62 $ */
/* NetHack 3.6 display.c $NHDT-Date: 1434024834 2015/06/11 12:13:54 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.67 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1747,7 +1747,7 @@ xchar x, y;
(DARKROOMSYM) : S_stone;
}
/* if (idx != S_room) */
if (idx != S_room)
bkglyph = cmap_to_glyph(idx);
return bkglyph;

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1433283602 2015/06/02 22:20:02 $ $NHDT-Branch: master $:$NHDT-Revision: 1.216 $ */
/* NetHack 3.6 options.c $NHDT-Date: 1434024839 2015/06/11 12:13:59 $ $NHDT-Branch: win32-x64-working $:$NHDT-Revision: 1.218 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -79,6 +79,11 @@ static struct Bool_Opt {
{ "autoopen", &flags.autoopen, TRUE, SET_IN_GAME },
{ "autopickup", &flags.pickup, TRUE, SET_IN_GAME },
{ "autoquiver", &flags.autoquiver, FALSE, SET_IN_GAME },
#if defined(WIN32)
{ "background_glyphs", &iflags.use_background_glyph, TRUE, DISP_IN_GAME },
#else
{ "background_glyphs", &iflags.use_background_glyph, FALSE, DISP_IN_GAME },
#endif
#if defined(MICRO) && !defined(AMIGA)
{ "BIOS", &iflags.BIOS, FALSE, SET_IN_FILE },
#else