From: nhmall Date: Mon, 22 Jun 2015 19:06:00 +0000 (-0400) Subject: fix windows console bug reveals monster (console tty) X-Git-Tag: NetHack-3.6.0_RC01~242 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ba5def8f119d448344c622367c99a64b011766f;p=nethack fix windows console bug reveals monster (console tty) --- diff --git a/src/options.c b/src/options.c index 73f043b75..85dc4c7f0 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 options.c $NHDT-Date: 1434056951 2015/06/11 21:09:11 $ $NHDT-Branch: master $:$NHDT-Revision: 1.219 $ */ +/* NetHack 3.6 options.c $NHDT-Date: 1434999932 2015/06/22 19:05:32 $ $NHDT-Branch: master $:$NHDT-Revision: 1.221 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -79,11 +79,6 @@ 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 diff --git a/src/version.c b/src/version.c index fb6259809..7fe4506f6 100644 --- a/src/version.c +++ b/src/version.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 version.c $NHDT-Date: 1434916287 2015/06/21 19:51:27 $ $NHDT-Branch: master $:$NHDT-Revision: 1.37 $ */ +/* NetHack 3.6 version.c $NHDT-Date: 1434999940 2015/06/22 19:05:40 $ $NHDT-Branch: master $:$NHDT-Revision: 1.38 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -15,7 +15,7 @@ #include "patchlevel.h" #endif -#define BETA_INFO "Beta4" +#define BETA_INFO "Beta5" STATIC_DCL void FDECL(insert_rtoptions, (winid,char *,const char *)); diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c index 53e4cf32c..5a78fb696 100644 --- a/sys/share/pcmain.c +++ b/sys/share/pcmain.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 pcmain.c $NHDT-Date: 1432512787 2015/05/25 00:13:07 $ $NHDT-Branch: master $:$NHDT-Revision: 1.64 $ */ +/* NetHack 3.6 pcmain.c $NHDT-Date: 1434999947 2015/06/22 19:05:47 $ $NHDT-Branch: master $:$NHDT-Revision: 1.65 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -364,8 +364,12 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/ NHWinMainInit(); else */ - if (!strncmpi(windowprocs.name, "tty", 3)) + if (!strncmpi(windowprocs.name, "tty", 3)) { + iflags.use_background_glyph = FALSE; nttty_open(1); + } else { + iflags.use_background_glyph = TRUE; + } #endif #endif