From 4ba3b7da34f4383a0b6263c503508bbed65ec6bb Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Thu, 5 Oct 2006 03:11:52 +0000 Subject: [PATCH] win32 palette option tweak The palette option is supposed to be allowed in the config file without a value for win32 to trigger a load of a predefined NetHack palette, but that wasn't working. This fixes that. To prevent the use of any palette modification code at all, just leave the palette option out of the config file entirely. --- src/options.c | 11 ++++++----- sys/winnt/nttty.c | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/options.c b/src/options.c index ae23b469e..20cc5d1ac 100644 --- a/src/options.c +++ b/src/options.c @@ -1514,11 +1514,12 @@ boolean tinitial, tfrom_file; # ifdef MAC } # endif +#ifdef WIN32CON + op = string_for_opt(opts, TRUE); + if (!alternative_palette(op)) + badoption(opts); +#else if ((op = string_for_opt(opts, FALSE)) != (char *)0) { -# ifdef WIN32CON - if (!alternative_palette(op)) - badoption(opts); -# else char *pt = op; int cnt, tmp, reverse; long rgb; @@ -1558,8 +1559,8 @@ boolean tinitial, tfrom_file; change_color(color_number, rgb, reverse); color_number += color_incr; } -# endif /* !WIN32CON */ } +# endif /* !WIN32CON */ if (!initial) { need_redraw = TRUE; } diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c index 0d5812a55..1c641c1f8 100644 --- a/sys/winnt/nttty.c +++ b/sys/winnt/nttty.c @@ -1087,7 +1087,6 @@ long rgb; /* copy the NetHack palette into UserDefinedColors */ for (k=0; k < CLR_MAX; k++) UserDefinedColors[k] = NetHackColors[k]; - return; } else if (color_number >= 0 && color_number < CLR_MAX) { if (!altered_palette) { /* make sure a full suite is available */ -- 2.40.0