SYSCF for VMS (trunk only)

Enable SYSCF_FILE for VMS, and simplify option initialization
in the process.  I still need to put a template into the playground
directory during initial install, and the one in sys/unix/ probably
isn't appropriate.
This commit is contained in:
nethack.rankin
2011-04-23 01:51:01 +00:00
parent 4222d09874
commit 2228943015
4 changed files with 17 additions and 12 deletions

View File

@@ -561,12 +561,17 @@ const char *ev;
return (char *)0;
}
/* Split initoptions into 2 parts for SYSCF but don't break anything not
* using SYSCF. */
/* process options, possibly including SYSCF */
void
initoptions()
{
initoptions_init();
#ifdef SYSCF
/* someday there may be other SYSCF alternatives besides text file */
# ifdef SYSCF_FILE
read_config_file(SYSCF_FILE, SET_IN_SYS);
# endif
#endif
initoptions_finish();
}
@@ -660,9 +665,7 @@ initoptions_init()
if ((opts = nh_getenv("TERM")) && !strncmp(opts, "AT", 2)) {
#ifdef LOADSYMSETS
if (!symset[PRIMARY].name) load_symset("IBMGraphics", PRIMARY);
if (!symset[ROGUESET].name) load_symset("RogueIBM", ROGUESET);
switch_symbols(TRUE);
#endif
# ifdef TEXTCOLOR