From ec9d3cb88ed5ec141a9e7a102e4acecdbae44f94 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 13 May 2023 13:49:57 -0400 Subject: [PATCH] keep external identifiers under 31 characters length --- doc/sound.txt | 2 +- doc/window.txt | 4 ++-- include/extern.h | 2 +- outdated/sys/amiga/winami.c | 2 +- outdated/sys/be/bemain.c | 2 +- outdated/sys/mac/macmain.c | 2 +- outdated/sys/msdos/SCHEMA35.MSC | 2 +- outdated/sys/msdos/schema3.MSC | 2 +- outdated/win/gem/wingem.c | 2 +- src/allmain.c | 4 ++-- sys/libnh/libnhmain.c | 2 +- sys/share/pcmain.c | 2 +- sys/unix/unixmain.c | 2 +- sys/vms/vmsmain.c | 2 +- sys/windows/windmain.c | 2 +- win/tty/wintty.c | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/sound.txt b/doc/sound.txt index 3d88e9cd7..30498a58a 100644 --- a/doc/sound.txt +++ b/doc/sound.txt @@ -331,7 +331,7 @@ activation. value that the platform's main() may have placed there earlier via its own call to assign_soundlib()] - 2. init_sound_and_display_gamewindows() + 2. init_sound_disp_gamewindows() -> activate_chosen_soundlib() is called prior to displaying the game windows. diff --git a/doc/window.txt b/doc/window.txt index 51bbaacde..d3af42560 100644 --- a/doc/window.txt +++ b/doc/window.txt @@ -1027,11 +1027,11 @@ initoptions() /* read the resource file */ init_nhwindows() /* initialize the window system */ process_options(argc, argv) /* process command line options or equiv */ if(save file is present) { - init_sound_and_display_gamewindows() /* init sound, create & display */ + init_sound_disp_gamewindows() /* init sound, create & display */ dorestore() /* restore old game; pline()s are OK */ } else { player_selection() /* select a player type using a window */ - init_sound_and_display_gamewindows() /* init sound, create & display */ + init_sound_disp_gamewindows() /* init sound, create & display */ } pline("Hello, welcome..."); diff --git a/include/extern.h b/include/extern.h index 05723e838..e7c009385 100644 --- a/include/extern.h +++ b/include/extern.h @@ -22,7 +22,7 @@ extern void early_init(void); extern void moveloop_core(void); extern void moveloop(boolean); extern void stop_occupation(void); -extern void init_sound_and_display_gamewindows(void); +extern void init_sound_disp_gamewindows(void); extern void newgame(void); extern void welcome(boolean); extern int argcheck(int, char **, enum earlyarg); diff --git a/outdated/sys/amiga/winami.c b/outdated/sys/amiga/winami.c index 7945ae316..f80490a83 100644 --- a/outdated/sys/amiga/winami.c +++ b/outdated/sys/amiga/winami.c @@ -427,7 +427,7 @@ struct NewScreen NewHackScreen = { 0, 0, WIDTH, SCREENHEIGHT, 3, 0, * explicitly (by being the wizard) or by askname. * It may still contain a suffix denoting pl_character. * Always called after init_nhwindows() and before - * init_sound_and_display_gamewindows(). + * init_sound_disp_gamewindows(). */ void amii_askname() diff --git a/outdated/sys/be/bemain.c b/outdated/sys/be/bemain.c index 0cc921a9d..a480c9e1a 100644 --- a/outdated/sys/be/bemain.c +++ b/outdated/sys/be/bemain.c @@ -64,7 +64,7 @@ MAIN(int argc, char **argv) */ vision_init(); - init_sound_and_display_gamewindows(); + init_sound_disp_gamewindows(); /* * First, try to find and restore a save file for specified character. diff --git a/outdated/sys/mac/macmain.c b/outdated/sys/mac/macmain.c index 55a8d2e8a..5ffa3b72c 100644 --- a/outdated/sys/mac/macmain.c +++ b/outdated/sys/mac/macmain.c @@ -65,7 +65,7 @@ main(void) */ vision_init(); - init_sound_and_display_gamewindows(); + init_sound_disp_gamewindows(); set_playmode(); /* sets plname to "wizard" for wizard mode */ /* strip role,race,&c suffix; calls askname() if plname[] is empty diff --git a/outdated/sys/msdos/SCHEMA35.MSC b/outdated/sys/msdos/SCHEMA35.MSC index 7afb12661..5d9392e69 100644 --- a/outdated/sys/msdos/SCHEMA35.MSC +++ b/outdated/sys/msdos/SCHEMA35.MSC @@ -74,7 +74,7 @@ functions:49 _delete_levelfile _delete_savefile _delfloortrap _deliver_by_pline functions:50 _demonpet _destroy_arm _destroy_drawbridge _destroy_item _destroy_mitem _dev_name _dig functions:51 _dig_check _dig_corridor _dig_point _dig_typ _digactualhole _dighole _digit _dipfountain functions:52 _disable_ctrlP _disarm_landmine _disarm_shooting_trap _disarm_squeaky_board _discard_minvent _disclose _discover_object -functions:53 _diseasemu _display_binventory _display_cinventory _init_sound_and_display_gamewindows _display_inventory _display_minventory +functions:53 _diseasemu _display_binventory _display_cinventory _init_sound_disp_gamewindows _display_inventory _display_minventory functions:54 _distant_name _distfleeck _disturb _djinni_from_bottle _dlb_cleanup _dlb_fclose functions:55 _dlb_fgets _dlb_fopen _dlb_fread _dlb_fseek _dlb_ftell _dlb_init _dlord _dmgtype functions:56 _dmgval _dmonsfree _dmore _dname_to_dnum _do_break_wand _do_clear_area _do_comp _do_dknown_of diff --git a/outdated/sys/msdos/schema3.MSC b/outdated/sys/msdos/schema3.MSC index 0b56c1232..ab9353f67 100644 --- a/outdated/sys/msdos/schema3.MSC +++ b/outdated/sys/msdos/schema3.MSC @@ -74,7 +74,7 @@ functions:49 _delete_levelfile _delete_savefile _delfloortrap _deliver_by_pline functions:50 _demonpet _destroy_arm _destroy_drawbridge _destroy_item _destroy_mitem _dev_name _dig functions:51 _dig_check _dig_corridor _dig_point _dig_typ _digactualhole _dighole _digit _dipfountain functions:52 _disable_ctrlP _disarm_landmine _disarm_shooting_trap _disarm_squeaky_board _discard_minvent _disclose _discover_object -functions:53 _diseasemu _display_binventory _display_cinventory _init_sound_and_display_gamewindows _display_inventory _display_minventory +functions:53 _diseasemu _display_binventory _display_cinventory _init_sound_disp_gamewindows _display_inventory _display_minventory functions:54 _distant_name _distfleeck _disturb _djinni_from_bottle _dlb_cleanup _dlb_fclose functions:55 _dlb_fgets _dlb_fopen _dlb_fread _dlb_fseek _dlb_ftell _dlb_init _dlord _dmgtype functions:56 _dmgval _dmonsfree _dmore _dname_to_dnum _do_break_wand _do_clear_area _do_comp _do_dknown_of diff --git a/outdated/win/gem/wingem.c b/outdated/win/gem/wingem.c index 12b0ffe71..077a7ebba 100644 --- a/outdated/win/gem/wingem.c +++ b/outdated/win/gem/wingem.c @@ -495,7 +495,7 @@ Gem_player_selection() * plname is filled either by an option (-u Player or -uPlayer) or * explicitly (by being the wizard) or by askname. * It may still contain a suffix denoting pl_character. - * Always called after init_nhwindows() and before init_sound_and_display_gamewindows(). + * Always called after init_nhwindows() and before init_sound_disp_gamewindows(). */ void diff --git a/src/allmain.c b/src/allmain.c index c71cfbaf9..c593cdc72 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -650,7 +650,7 @@ stop_occupation(void) } void -init_sound_and_display_gamewindows(void) +init_sound_disp_gamewindows(void) { int menu_behavior = MENU_BEHAVE_STANDARD; @@ -683,7 +683,7 @@ init_sound_and_display_gamewindows(void) #ifdef MAC /* This _is_ the right place for this - maybe we will - * have to split init_sound_and_display_gamewindows into + * have to split init_sound_disp_gamewindows into * create_gamewindows and show_gamewindows to get rid of this ifdef... */ if (!strcmp(windowprocs.name, "mac")) diff --git a/sys/libnh/libnhmain.c b/sys/libnh/libnhmain.c index ddfdf9074..6743b6a33 100644 --- a/sys/libnh/libnhmain.c +++ b/sys/libnh/libnhmain.c @@ -247,7 +247,7 @@ nhmain(int argc, char *argv[]) */ vision_init(); - init_sound_and_display_gamewindows(); + init_sound_disp_gamewindows(); /* * First, try to find and restore a save file for specified character. diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c index 196af1996..1123c2278 100644 --- a/sys/share/pcmain.c +++ b/sys/share/pcmain.c @@ -448,7 +448,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/ */ vision_init(); - init_sound_and_display_gamewindows(); + init_sound_disp_gamewindows(); /* * First, try to find and restore a save file for specified character. * We'll return here if new game player_selection() renames the hero. diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c index 9703e210d..50b262adc 100644 --- a/sys/unix/unixmain.c +++ b/sys/unix/unixmain.c @@ -218,7 +218,7 @@ main(int argc, char *argv[]) */ vision_init(); - init_sound_and_display_gamewindows(); + init_sound_disp_gamewindows(); /* * First, try to find and restore a save file for specified character. diff --git a/sys/vms/vmsmain.c b/sys/vms/vmsmain.c index a7c7c2ccd..6fe999995 100644 --- a/sys/vms/vmsmain.c +++ b/sys/vms/vmsmain.c @@ -183,7 +183,7 @@ main(int argc, char *argv[]) */ vision_init(); - init_sound_and_display_gamewindows(); + init_sound_disp_gamewindows(); /* * First, try to find and restore a save file for specified character. diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c index bcfeca6b0..010101ce9 100644 --- a/sys/windows/windmain.c +++ b/sys/windows/windmain.c @@ -678,7 +678,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/ * new game or before a level restore on a saved game. */ vision_init(); - init_sound_and_display_gamewindows(); + init_sound_disp_gamewindows(); /* * First, try to find and restore a save file for specified character. * We'll return here if new game player_selection() renames the hero. diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 06089c85d..b1c48645f 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -587,7 +587,7 @@ tty_player_selection(void) * explicitly (by being the wizard) or by askname. * It may still contain a suffix denoting the role, etc. * Always called after init_nhwindows() and before - * init_sound_and_display_gamewindows(). + * init_sound_disp_gamewindows(). */ void tty_askname(void)