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

Merge branch 'crosscompile-integration-core' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2020-09-28 18:07:19 -04:00
parent 9bb515f196 b9b4755fe3
commit ba34897fa6
13 changed files with 706 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/options.c
View File

@@ -1450,14 +1450,15 @@ char *op;
if (g.symset[PRIMARY].name) {
badflag = TRUE;
} else {
g.symset[PRIMARY].name = dupstr(fullname);
g.symset[PRIMARY].name = dupstr(allopt[optidx].name);
if (!read_sym_file(PRIMARY)) {
badflag = TRUE;
clear_symsetentry(PRIMARY, TRUE);
}
}
if (badflag) {
config_error_add("Failure to load symbol set %s.", fullname);
config_error_add("Failure to load symbol set %s.",
allopt[optidx].name);
return FALSE;
} else {
switch_symbols(TRUE);
@@ -2440,6 +2441,7 @@ char *op;
if (!g.opt_initial) {
g.opt_need_redraw = TRUE;
}
}
#endif /* CHANGE_COLOR */
return optn_ok;
}
@@ -2455,6 +2457,7 @@ char *op;
return optn_ok;
}
int
optfn_paranoid_confirmation(optidx, req, negated, opts, op)
int optidx;