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

New options: swap symset to roguesymset on rogue level

Browse Source
This commit is contained in:
Pasi Kallinen
2022-08-04 09:48:58 +03:00
parent dd28f8b405
commit b5acfc5c3f
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/options.c
View File

@@ -302,6 +302,7 @@ static void free_one_menu_coloring(int);
static int count_menucolors(void);
static boolean parse_role_opts(int, boolean, const char *,
char *, char **);
static int get_option_index(const char *);
static unsigned int longest_option_name(int, int);
static void doset_add_menu(winid, const char *, int, int);
static int handle_add_list_remove(const char *, int);
@@ -7719,6 +7720,18 @@ longest_option_name(int startpass, int endpass)
return longest_name_len;
}
static int
get_option_index(const char *optname)
{
int i;
for (i = 0; allopt[i].name != 0; i++)
if (!strcmp(optname, allopt[i].name))
return i;
return -1;
}
/* #options - the user friendly version */
int
doset_simple(void)
@@ -7776,10 +7789,18 @@ rerun:
const char *value = "unknown";
int reslt = optn_err;
char buf2[BUFSZ];
int k = i;
if (allopt[i].optfn == optfn_symset && Is_rogue_level(&u.uz)) {
k = get_option_index("roguesymset");
if (k == -1)
k = i;
name = allopt[k].name;
}
buf2[0] = '\0';
if (allopt[i].optfn)
reslt = (*allopt[i].optfn)(allopt[i].idx, get_val,
if (allopt[k].optfn)
reslt = (*allopt[k].optfn)(allopt[k].idx, get_val,
FALSE, buf2, empty_optstr);
if (reslt == optn_ok && buf2[0])
value = (const char *) buf2;