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.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user