Merge branch 'NetHack-3.7' into NetHack-3.7-Jan2020

This commit is contained in:
nhmall
2020-01-27 08:52:17 -05:00
25 changed files with 1438 additions and 530 deletions

View File

@@ -3368,8 +3368,31 @@ boolean tinitial, tfrom_file;
return retval;
}
#endif /* VIDEOSHADES */
#ifdef MSDOS
fullname = "video_width";
if (match_optname(opts, fullname, 7, TRUE)) {
if (duplicate)
complain_about_duplicate(opts, 1);
if (negated) {
bad_negation(fullname, FALSE);
return FALSE;
}
op = string_for_opt(opts, negated);
iflags.wc_video_width = strtol(op, NULL, 10);
return FALSE;
}
fullname = "video_height";
if (match_optname(opts, fullname, 7, TRUE)) {
if (duplicate)
complain_about_duplicate(opts, 1);
if (negated) {
bad_negation(fullname, FALSE);
return FALSE;
}
op = string_for_opt(opts, negated);
iflags.wc_video_height = strtol(op, NULL, 10);
return FALSE;
}
#ifdef NO_TERMS
/* video:string -- must be after longer tests */
fullname = "video";