nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

github pull request #235 - curses symbol set init

Browse Source 
Fixes #235

For initial options under curses, specifying 'DECgraphics' as a
boolean rather than as 'symset:DECgraphics' wasn't overriding the
new default 'symset:curses'.  Since previously DECgraphics was
rejected for curses, it's possible that no one noticed.
This commit is contained in:
PatR
2019-10-17 14:38:45 -07:00
parent 0c86965d5e
commit 6182b014ca
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 options.c $NHDT-Date: 1571313653 2019/10/17 12:00:53 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.378 $ */
/* NetHack 3.6 options.c $NHDT-Date: 1571347977 2019/10/17 21:32:57 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.379 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */
@@ -2315,7 +2315,6 @@ boolean tinitial, tfrom_file;
} else {
if (!initial && Is_rogue_level(&u.uz))
assign_graphics(ROGUESET);
symset[ROGUESET].fallback = FALSE;
need_redraw = TRUE;
}
} else
@@ -2340,7 +2339,6 @@ boolean tinitial, tfrom_file;
return FALSE;
} else {
switch_symbols(symset[PRIMARY].name != (char *) 0);
symset[PRIMARY].fallback = FALSE;
need_redraw = TRUE;
}
} else
@@ -6061,10 +6059,8 @@ int which_set;
if (read_sym_file(which_set)) {
switch_symbols(TRUE);
symset[which_set].fallback = FALSE;
} else {
clear_symsetentry(which_set, TRUE);
symset[which_set].fallback = TRUE;
return 0;
}
return 1;