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

implicit_uncursed, mention_walls

Browse Source 
Move 'implicit_uncursed' and 'mention_walls' from iflags to flags to
make their current setting persist across save/restore.  Invalidates
existing save files.
This commit is contained in:
PatR
2020-01-17 04:03:14 -08:00
parent 1a89e44e19
commit d19cab4d98
8 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 options.c $NHDT-Date: 1577050473 2019/12/22 21:34:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.422 $ */
/* NetHack 3.7 options.c $NHDT-Date: 1579261293 2020/01/17 11:41:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.428 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */
@@ -146,7 +146,7 @@ static const struct Bool_Opt {
#else
{ "ignintr", (boolean *) 0, FALSE, SET_IN_FILE },
#endif
{ "implicit_uncursed", &iflags.implicit_uncursed, TRUE, SET_IN_GAME },
{ "implicit_uncursed", &flags.implicit_uncursed, TRUE, SET_IN_GAME },
{ "large_font", &iflags.obsolete, FALSE, SET_IN_FILE }, /* OBSOLETE */
{ "legacy", &flags.legacy, TRUE, DISP_IN_GAME },
{ "lit_corridor", &flags.lit_corridor, FALSE, SET_IN_GAME },
@@ -156,7 +156,7 @@ static const struct Bool_Opt {
#else
{ "mail", (boolean *) 0, TRUE, SET_IN_FILE },
#endif
{ "mention_walls", &iflags.mention_walls, FALSE, SET_IN_GAME },
{ "mention_walls", &flags.mention_walls, FALSE, SET_IN_GAME },
{ "menucolors", &iflags.use_menu_color, FALSE, SET_IN_GAME },
/* for menu debugging only*/
{ "menu_tab_sep", &iflags.menu_tab_sep, FALSE, SET_IN_WIZGAME },
@@ -4052,7 +4052,7 @@ boolean tinitial, tfrom_file;
g.context.botl = TRUE;
} else if (boolopt[i].addr == &flags.invlet_constant
|| boolopt[i].addr == &flags.sortpack
|| boolopt[i].addr == &iflags.implicit_uncursed) {
|| boolopt[i].addr == &flags.implicit_uncursed) {
if (!flags.invlet_constant)
reassign();
update_inventory();