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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-31 19:48:51 -05:00
parent d36eaf8f99 4de4155998
commit 16d5d3f2e5
10 changed files with 93 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/options.c
View File

@@ -3291,8 +3291,10 @@ boolean tinitial, tfrom_file;
} else if (!(opts = string_for_env_opt(fullname, opts, FALSE))) {
return FALSE;
}
if (!assign_videocolors(opts)) /* TODO: error msg */
if (!assign_videocolors(opts)) {
config_error_add("Unknown error handling '%s'", fullname);
return FALSE;
}
return retval;
}
/* videoshades:string */
@@ -3306,8 +3308,10 @@ boolean tinitial, tfrom_file;
} else if (!(opts = string_for_env_opt(fullname, opts, FALSE))) {
return FALSE;
}
if (!assign_videoshades(opts)) /* TODO: error msg */
if (!assign_videoshades(opts)) {
config_error_add("Unknown error handling '%s'", fullname);
return FALSE;
}
return retval;
}
#endif /* VIDEOSHADES */
@@ -3324,8 +3328,10 @@ boolean tinitial, tfrom_file;
} else if (!(opts = string_for_env_opt(fullname, opts, FALSE))) {
return FALSE;
}
if (!assign_video(opts)) /* TODO: error msg */
if (!assign_video(opts)) {
config_error_add("Unknown error handling '%s'", fullname);
return FALSE;
}
return retval;
}
#endif /* NO_TERMS */
@@ -3340,8 +3346,10 @@ boolean tinitial, tfrom_file;
} else if (!(opts = string_for_env_opt(fullname, opts, FALSE))) {
return FALSE;
}
if (!assign_soundcard(opts)) /* TODO: error msg */
if (!assign_soundcard(opts)) {
config_error_add("Unknown error handling '%s'", fullname);
return FALSE;
}
return retval;
}
#endif /* MSDOS */
@@ -3565,10 +3573,14 @@ boolean tinitial, tfrom_file;
if (duplicate)
complain_about_duplicate(opts, 1);
if ((op = string_for_opt(opts, FALSE)) != 0) {
if (!wc_set_window_colors(op)) /* TODO: error msg*/
if (!wc_set_window_colors(op)) {
config_error_add("Could not set %s '%s'", fullname, op);
return FALSE;
} else if (negated)
}
} else if (negated) {
bad_negation(fullname, TRUE);
return FALSE;
}
return retval;
}
#ifdef CURSES_GRAPHICS
@@ -3578,8 +3590,10 @@ boolean tinitial, tfrom_file;
if (match_optname(opts, fullname, sizeof "term_cols" - 1, TRUE)) {
op = string_for_opt(opts, negated);
iflags.wc2_term_cols = atoi(op);
if (negated)
bad_negation(fullname, FALSE);
if (negated) {
bad_negation(fullname, FALSE);
return FALSE;
}
return retval;
}
@@ -3589,8 +3603,10 @@ boolean tinitial, tfrom_file;
if (match_optname(opts, fullname, sizeof "term_rows" - 1, TRUE)) {
op = string_for_opt(opts, negated);
iflags.wc2_term_rows = atoi(op);
if (negated)
if (negated) {
bad_negation(fullname, FALSE);
return FALSE;
}
return retval;
}
@@ -3602,16 +3618,20 @@ boolean tinitial, tfrom_file;
if (op && !negated) {
#ifdef CURSES_GRAPHICS
iflags.wc2_petattr = curses_read_attrs(op);
if (!curses_read_attrs(op))
if (!curses_read_attrs(op)) {
config_error_add("Unknown %s parameter '%s'", fullname, opts);
return FALSE;
}
#else
/* non-curses windowports will not use this flag anyway
* but the above will not compile if we don't have curses.
* Just set it to a sensible default: */
iflags.wc2_petattr = ATR_INVERSE
#endif
} else if (negated) bad_negation(fullname, TRUE);
} else if (negated) {
bad_negation(fullname, TRUE);
return FALSE;
}
return retval;
}
@@ -3620,9 +3640,10 @@ boolean tinitial, tfrom_file;
fullname = "windowborders";
if (match_optname(opts, fullname, sizeof "windowborders" - 1, TRUE)) {
op = string_for_opt(opts, negated);
if (negated && op)
if (negated && op) {
bad_negation(fullname, TRUE);
else {
return FALSE;
} else {
if (negated)
iflags.wc2_windowborders = 2; /* Off */
else if (!op)
@@ -3633,6 +3654,7 @@ boolean tinitial, tfrom_file;
|| (iflags.wc2_windowborders < 1)) {
iflags.wc2_windowborders = 0;
config_error_add("Badoption - windowborders %s.", opts);
return FALSE;
}
}
return retval;