heed OPTIONS=symset:default in config file in windows and msdos

This commit is contained in:
nhmall
2018-09-10 15:27:05 -04:00
parent 8210f81618
commit 59019910b5
3 changed files with 10 additions and 10 deletions
+1
View File
@@ -148,6 +148,7 @@ windows-tty: Use nhraykey by default if the players keyboard layout is
non-english as reported in H4216 non-english as reported in H4216
windows-tty: We now support changing altkeyhandler in game windows-tty: We now support changing altkeyhandler in game
windows: Added ntassert() mechanism for Windows based port use windows: Added ntassert() mechanism for Windows based port use
windows: heed OPTIONS=symset:default in config file if it is present
tty: significant optimizations for performance and per field rendering tty: significant optimizations for performance and per field rendering
tty: use WC2_FLUSH_STATUS to buffer changes until BL_FLUSH is received tty: use WC2_FLUSH_STATUS to buffer changes until BL_FLUSH is received
tty: support BL_RESET in status_update to force an update to all status fields tty: support BL_RESET in status_update to force an update to all status fields
+9
View File
@@ -778,6 +778,15 @@ initoptions_init()
#endif #endif
#endif /* UNIX || VMS */ #endif /* UNIX || VMS */
#if defined(MSDOS) || defined(WIN32)
/* Use IBM defaults. Can be overridden via config file */
if (!symset[PRIMARY].name) {
load_symset("IBMGraphics_2", PRIMARY);
}
if (!symset[ROGUESET].name) {
load_symset("RogueEpyx", ROGUESET);
}
#endif
#ifdef MAC_GRAPHICS_ENV #ifdef MAC_GRAPHICS_ENV
if (!symset[PRIMARY].name) if (!symset[PRIMARY].name)
load_symset("MACGraphics", PRIMARY); load_symset("MACGraphics", PRIMARY);
-10
View File
@@ -497,16 +497,6 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
#endif #endif
#endif #endif
#if defined(MSDOS) || defined(WIN32)
/* Player didn't specify any symbol set so use IBM defaults */
if (!symset[PRIMARY].name) {
load_symset("IBMGraphics_2", PRIMARY);
}
if (!symset[ROGUESET].name) {
load_symset("RogueEpyx", ROGUESET);
}
#endif
#if defined(MSDOS) || defined(WIN32) #if defined(MSDOS) || defined(WIN32)
init_nhwindows(&argc, argv); init_nhwindows(&argc, argv);
#else #else