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

some further startup, option processing bits

Browse Source
This commit is contained in:
nhmall
2026-04-23 14:31:43 -04:00
parent 21f0e18595
commit 93ab8405d8
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/earlyarg.c
View File

@@ -182,6 +182,11 @@ early_options(int *argc_p, char ***argv_p, char **hackdir_p)
char **argv, *arg, *origarg; char **argv, *arg, *origarg;
int argc, oldargc, ndx = 0, consumed = 0; int argc, oldargc, ndx = 0, consumed = 0;
#ifdef ENHANCED_SYMBOLS
if (argcheck(*argc_p, *argv_p, ARG_DUMPGLYPHIDS) == 2)
opt_terminate();
#endif
config_error_init(FALSE, "command line", FALSE); config_error_init(FALSE, "command line", FALSE);
/* treat "nethack ?" as a request for usage info; due to shell /* treat "nethack ?" as a request for usage info; due to shell

2
src/options.c
View File

@@ -7368,7 +7368,7 @@ initoptions_finish(void)
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
if (glyphid_cache_status()) if (glyphid_cache_status())
free_glyphid_cache(); free_glyphid_cache();
apply_customizations(gc.currentgraphics, do_custom_symbols); apply_customizations(gc.currentgraphics, do_custom_symbols | do_custom_colors);
#endif #endif
go.opt_initial = FALSE; go.opt_initial = FALSE;
return; return;

4
src/symbols.c
View File

@@ -638,14 +638,14 @@ parse_sym_line(char *buf, int which_set)
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
} else { } else {
if (gc.chosen_symset_start) { if (gc.chosen_symset_start) {
glyphrep_to_custom_map_entries(buf, &glyph); (void) glyphrep_to_custom_map_entries(buf, &glyph);
} }
#endif #endif
} }
} }
} else if (gc.chosen_symset_start) { } else if (gc.chosen_symset_start) {
/* glyph, not symbol */ /* glyph, not symbol */
glyphrep_to_custom_map_entries(buf, &glyph); (void) glyphrep_to_custom_map_entries(buf, &glyph);
} }
#ifndef ENHANCED_SYMBOLS #ifndef ENHANCED_SYMBOLS
nhUse(glyph); nhUse(glyph);

4
sys/unix/unixmain.c
View File

@@ -123,10 +123,6 @@ main(int argc, char *argv[])
dir = nh_getenv("HACKDIR"); dir = nh_getenv("HACKDIR");
#endif /* CHDIR */ #endif /* CHDIR */
program_state.early_options = 1; program_state.early_options = 1;
#ifdef ENHANCED_SYMBOLS
if (argcheck(argc, argv, ARG_DUMPGLYPHIDS) == 2)
exit(EXIT_SUCCESS);
#endif
/* handle -dalthackdir, -s <score stuff>, --version, --showpaths */ /* handle -dalthackdir, -s <score stuff>, --version, --showpaths */
early_options(&argc, &argv, &dir); early_options(&argc, &argv, &dir);
program_state.early_options = 0; program_state.early_options = 0;

15
sys/windows/windmain.c
View File

@@ -167,12 +167,6 @@ MAIN(int argc, char *argv[])
/* setting iflags.colorcount has to be after early_init() /* setting iflags.colorcount has to be after early_init()
* because it zeros out all of iflags */ * because it zeros out all of iflags */
hwnd = GetDesktopWindow(); hwnd = GetDesktopWindow();
hdc = GetDC(hwnd);
if (hdc) {
bpp = GetDeviceCaps(hdc, BITSPIXEL);
iflags.colorcount = (bpp >= 16) ? 16777216 : (bpp >= 8) ? 256 : 16;
ReleaseDC(hwnd, hdc);
}
#ifdef _MSC_VER #ifdef _MSC_VER
#ifdef DEBUG #ifdef DEBUG
@@ -201,6 +195,15 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
#ifndef MSWIN_GRAPHICS #ifndef MSWIN_GRAPHICS
early_init(argc, argv); /* already in WinMain for MSWIN_GRAPHICS */ early_init(argc, argv); /* already in WinMain for MSWIN_GRAPHICS */
#endif #endif
/* this must be done after early_init() because early_init()
sets iflags to zero */
hdc = GetDC(hwnd);
if (hdc) {
bpp = GetDeviceCaps(hdc, BITSPIXEL);
iflags.colorcount = (bpp >= 16) ? 16777216 : (bpp >= 8) ? 256 : 16;
ReleaseDC(hwnd, hdc);
}
gh.hname = "NetHack"; /* used for syntax messages */ gh.hname = "NetHack"; /* used for syntax messages */
set_default_prefix_locations( set_default_prefix_locations(
argv[0]); /* must be re-done after initoptions_init() argv[0]); /* must be re-done after initoptions_init()