From: nethack.allison Date: Sun, 9 Jul 2006 17:39:43 +0000 (+0000) Subject: more zeroany (trunk only) X-Git-Tag: MOVE2GIT~950 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=999424aecc96e1c5481e50df92006b35ac5c9d3d;p=nethack more zeroany (trunk only) --- diff --git a/src/apply.c b/src/apply.c index 0e4271782..d797f6dfd 100644 --- a/src/apply.c +++ b/src/apply.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)apply.c 3.5 2006/06/17 */ +/* SCCS Id: @(#)apply.c 3.5 2006/07/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2657,7 +2657,7 @@ use_grapple (obj) char buf[BUFSZ]; menu_item *selected; - any.a_void = 0; /* set all bits to zero */ + any = zeroany; /* set all bits to zero */ any.a_int = 1; /* use index+1 (cant use 0) as identifier */ start_menu(tmpwin); any.a_int++; diff --git a/src/artifact.c b/src/artifact.c index 75f26d930..ce628966c 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)artifact.c 3.5 2006/05/31 */ +/* SCCS Id: @(#)artifact.c 3.5 2006/06/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1305,7 +1305,7 @@ arti_invoke(obj) winid tmpwin = create_nhwindow(NHW_MENU); anything any; - any.a_void = 0; /* set all bits to zero */ + any = zeroany; /* set all bits to zero */ start_menu(tmpwin); /* use index+1 (cant use 0) as identifier */ for (i = num_ok_dungeons = 0; i < n_dgns; i++) { diff --git a/src/cmd.c b/src/cmd.c index 67fde612a..df31aca03 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)cmd.c 3.5 2006/06/25 */ +/* SCCS Id: @(#)cmd.c 3.5 2006/07/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -356,7 +356,7 @@ extcmd_via_menu() /* here after # - now show pick-list of possible commands */ while (!ret) { i = n = 0; accelerator = 0; - any.a_void = 0; + any = zeroany; /* populate choices */ for(efp = extcmdlist; efp->ef_txt; efp++) { if (!matchlevel || !strncmp(efp->ef_txt, cbuf, matchlevel)) { @@ -1380,7 +1380,7 @@ minimal_enlightenment() fmtstr = iflags.menu_tab_sep ? tabbed_fmtstr : untabbed_fmtstr; deity_fmtstr = iflags.menu_tab_sep ? tabbed_deity_fmtstr : untabbed_deity_fmtstr; - any.a_void = 0; + any = zeroany; buf[0] = buf2[0] = '\0'; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); diff --git a/src/dungeon.c b/src/dungeon.c index 869017d99..53c52dc86 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)dungeon.c 3.5 2006/04/21 */ +/* SCCS Id: @(#)dungeon.c 3.5 2006/07/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1608,7 +1608,7 @@ boolean unreachable; lchoices->lev[lchoices->idx] = lvl_p->dlevel; lchoices->dgn[lchoices->idx] = lvl_p->dnum; lchoices->playerlev[lchoices->idx] = depth(lvl_p); - any.a_void = 0; + any = zeroany; if (unreachable) { /* not selectable, but still consumes next menuletter; prepend padding in place of missing menu selector */ @@ -1717,7 +1717,7 @@ xchar *rdgn; dptr->depth_start + dptr->entry_lev - 1); } if (bymenu) { - any.a_void = 0; + any = zeroany; add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, buf, MENU_UNSELECTED); } else putstr(win, 0, buf); diff --git a/src/invent.c b/src/invent.c index bb2b484d3..9bc7b6edc 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)invent.c 3.5 2006/06/17 */ +/* SCCS Id: @(#)invent.c 3.5 2006/07/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1770,13 +1770,13 @@ long* out_cnt; #endif nextclass: classcount = 0; - any.a_void = 0; /* set all bits to zero */ + any = zeroany; /* set all bits to zero */ for(otmp = invent; otmp; otmp = otmp->nobj) { ilet = otmp->invlet; if(!lets || !*lets || index(lets, ilet)) { + any = zeroany; /* zero */ if (!flags.sortpack || otmp->oclass == *invlet) { if (flags.sortpack && !classcount) { - any.a_void = 0; /* zero */ add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, let_to_name(*invlet, FALSE), MENU_UNSELECTED); classcount++; @@ -1845,14 +1845,14 @@ char avoidlet; win = create_nhwindow(NHW_MENU); start_menu(win); while (!done) { - any.a_void = 0; /* set all bits to zero */ + any = zeroany; /* set all bits to zero */ classcount = 0; for(otmp = invent; otmp; otmp = otmp->nobj) { ilet = otmp->invlet; if (ilet == avoidlet) continue; if (!flags.sortpack || otmp->oclass == *invlet) { if (flags.sortpack && !classcount) { - any.a_void = 0; /* zero */ + any = zeroany; /* zero */ add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, let_to_name(*invlet, FALSE), MENU_UNSELECTED); classcount++; @@ -2914,7 +2914,7 @@ const char *hdr, *txt; anything any; menu_item *selected; - any.a_void = 0; + any = zeroany; win = create_nhwindow(NHW_MENU); start_menu(win); add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, hdr, MENU_UNSELECTED); diff --git a/src/options.c b/src/options.c index a08a41acf..d6358723e 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)options.c 3.5 2005/11/19 */ +/* SCCS Id: @(#)options.c 3.5 2006/07/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2566,7 +2566,7 @@ doset_add_menu(win, option, indexoffset) anything any; int i; - any.a_void = 0; + any = zeroany; if (indexoffset == 0) { any.a_int = 0; value = get_compopt_value(option, buf2); @@ -2609,7 +2609,7 @@ doset() tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); - any.a_void = 0; + any = zeroany; add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, "Booleans (selecting will toggle value):", MENU_UNSELECTED); any.a_int = 0; @@ -2642,7 +2642,7 @@ doset() boolcount = i; indexoffset = boolcount; - any.a_void = 0; + any = zeroany; add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, "Compounds (selecting will prompt for new value):", @@ -2705,7 +2705,7 @@ doset() add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED); #endif /* AUTOPICKUP_EXCEPTIONS */ #ifdef PREFIXES_IN_USE - any.a_void = 0; + any = zeroany; add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, "Variable playground locations:", MENU_UNSELECTED); @@ -2818,6 +2818,7 @@ boolean setinitial,setfromfile; menu_item *burden_pick = (menu_item *)0; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); + any = zeroany; for (i = 0; i < SIZE(burdentype); i++) { burden_name = burdentype[i]; any.a_int = i + 1; @@ -2848,6 +2849,7 @@ boolean setinitial,setfromfile; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); + any = zeroany; for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) { disclosure_name = disclosure_names[i]; any.a_int = i + 1; @@ -2877,15 +2879,15 @@ boolean setinitial,setfromfile; any.a_char = DISCLOSE_NO_WITHOUT_PROMPT; add_menu(tmpwin, NO_GLYPH, &any, 'a', 0, ATR_NONE,"Never disclose and don't prompt", MENU_UNSELECTED); - any.a_void = 0; + any = zeroany; any.a_char = DISCLOSE_YES_WITHOUT_PROMPT; add_menu(tmpwin, NO_GLYPH, &any, 'b', 0, ATR_NONE,"Always disclose and don't prompt", MENU_UNSELECTED); - any.a_void = 0; + any = zeroany; any.a_char = DISCLOSE_PROMPT_DEFAULT_NO; add_menu(tmpwin, NO_GLYPH, &any, 'c', 0, ATR_NONE,"Prompt and default answer to \"No\"", MENU_UNSELECTED); - any.a_void = 0; + any = zeroany; any.a_char = DISCLOSE_PROMPT_DEFAULT_YES; add_menu(tmpwin, NO_GLYPH, &any, 'd', 0, ATR_NONE,"Prompt and default answer to \"Yes\"", MENU_UNSELECTED); @@ -2902,6 +2904,7 @@ boolean setinitial,setfromfile; menu_item *mode_pick = (menu_item *)0; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); + any = zeroany; for (i = 0; i < SIZE(runmodes); i++) { mode_name = runmodes[i]; any.a_int = i + 1; @@ -2920,6 +2923,7 @@ boolean setinitial,setfromfile; menu_item *window_pick = (menu_item *)0; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); + any = zeroany; any.a_char = 's'; add_menu(tmpwin, NO_GLYPH, &any, 's', 0, ATR_NONE, "single", MENU_UNSELECTED); @@ -2947,6 +2951,7 @@ boolean setinitial,setfromfile; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); + any = zeroany; any.a_int = ALIGN_TOP; add_menu(tmpwin, NO_GLYPH, &any, 't', 0, ATR_NONE, "top", MENU_UNSELECTED); @@ -2979,6 +2984,7 @@ boolean setinitial,setfromfile; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); + any = zeroany; for (i = 0; i < SIZE(npchoices); i++) { any.a_int = i + 1; add_menu(tmpwin, NO_GLYPH, &any, 'a' + i, 0, @@ -3007,6 +3013,7 @@ boolean setinitial,setfromfile; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); + any = zeroany; for (i = 0; i < SIZE(mhchoices); i++) { any.a_int = i + 1; add_menu(tmpwin, NO_GLYPH, &any, npletters[i], 0, @@ -3052,7 +3059,7 @@ boolean setinitial,setfromfile; totalapes = count_ape_maps(&numapes[AP_LEAVE], &numapes[AP_GRAB]); tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); - any.a_int = 0; + any = zeroany; for (i = 0; i < SIZE(action_titles); i++) { any.a_int++; /* omit list and remove if there aren't any yet */ @@ -3099,7 +3106,7 @@ boolean setinitial,setfromfile; for (pass = AP_LEAVE; pass <= AP_GRAB; ++pass) { if (numapes[pass] == 0) continue; ape = iflags.autopickup_exceptions[pass]; - any.a_void = 0; + any = zeroany; add_menu(tmpwin, NO_GLYPH, &any, 0, 0, iflags.menu_headings, (pass == 0) ? "Never pickup" : "Always pickup", MENU_UNSELECTED); @@ -3761,7 +3768,7 @@ char *class_select; if (class_list == (char *)0 || class_select == (char *)0) return 0; accelerator = 0; next_accelerator = 'a'; - any.a_void = 0; + any = zeroany; win = create_nhwindow(NHW_MENU); start_menu(win); while (*class_list) { diff --git a/src/pager.c b/src/pager.c index fa9a2043a..0053370ad 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)pager.c 3.5 2005/06/21 */ +/* SCCS Id: @(#)pager.c 3.5 2006/07/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -909,7 +909,7 @@ help_menu(sel) menu_item *selected; anything any; - any.a_void = 0; /* zero all bits */ + any = zeroany; /* zero all bits */ start_menu(tmpwin); #ifdef WIZARD if (!wizard) help_menu_items[WIZHLP_SLOT] = "", diff --git a/src/pickup.c b/src/pickup.c index 76e3e1463..d321930a3 100644 --- a/src/pickup.c +++ b/src/pickup.c @@ -753,7 +753,7 @@ boolean FDECL((*allow), (OBJ_P));/* allow function */ win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_obj = (struct obj *) 0; + any = zeroany; /* * Run through the list and add the objects to the menu. If @@ -776,7 +776,7 @@ boolean FDECL((*allow), (OBJ_P));/* allow function */ /* if sorting, print type name (once only) */ if (qflags & INVORDER_SORT && !printed_type_name) { - any.a_obj = (struct obj *) 0; + any = zeroany; add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, let_to_name(*pack, FALSE), MENU_UNSELECTED); printed_type_name = TRUE; @@ -881,7 +881,7 @@ int how; /* type of query */ pack = flags.inv_order; if ((qflags & ALL_TYPES) && (ccount > 1)) { invlet = 'a'; - any.a_void = 0; + any = zeroany; any.a_int = ALL_TYPES_SELECTED; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, (qflags & WORN_TYPES) ? "All worn types" : "All types", @@ -898,7 +898,7 @@ int how; /* type of query */ W_WEP | W_SWAPWEP | W_QUIVER))) continue; if (!collected_type_name) { - any.a_void = 0; + any = zeroany; any.a_int = curr->oclass; add_menu(win, NO_GLYPH, &any, invlet++, def_oc_syms[(int)objects[curr->otyp].oc_class], @@ -917,7 +917,7 @@ int how; /* type of query */ /* unpaid items if there are any */ if (do_unpaid) { invlet = 'u'; - any.a_void = 0; + any = zeroany; any.a_int = 'u'; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, "Unpaid items", MENU_UNSELECTED); @@ -925,14 +925,14 @@ int how; /* type of query */ /* billed items: checked by caller, so always include if BILLED_TYPES */ if (qflags & BILLED_TYPES) { invlet = 'x'; - any.a_void = 0; + any = zeroany; any.a_int = 'x'; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, "Unpaid items already used up", MENU_UNSELECTED); } if (qflags & CHOOSE_ALL) { invlet = 'A'; - any.a_void = 0; + any = zeroany; any.a_int = 'A'; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, (qflags & WORN_TYPES) ? @@ -942,28 +942,28 @@ int how; /* type of query */ /* items with b/u/c/unknown if there are any */ if (do_blessed) { invlet = 'B'; - any.a_void = 0; + any = zeroany; any.a_int = 'B'; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, "Items known to be Blessed", MENU_UNSELECTED); } if (do_cursed) { invlet = 'C'; - any.a_void = 0; + any = zeroany; any.a_int = 'C'; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, "Items known to be Cursed", MENU_UNSELECTED); } if (do_uncursed) { invlet = 'U'; - any.a_void = 0; + any = zeroany; any.a_int = 'U'; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, "Items known to be Uncursed", MENU_UNSELECTED); } if (do_buc_unknown) { invlet = 'X'; - any.a_void = 0; + any = zeroany; any.a_int = 'X'; add_menu(win, NO_GLYPH, &any, invlet, 0, ATR_NONE, "Items of unknown B/C/U status", @@ -2423,7 +2423,7 @@ boolean outokay, inokay; int n; const char *menuselector = flags.lootabc ? "abc" : "oib"; - any.a_void = 0; + any = zeroany; win = create_nhwindow(NHW_MENU); start_menu(win); if (outokay) { diff --git a/src/spell.c b/src/spell.c index db7d1d070..ccef69891 100644 --- a/src/spell.c +++ b/src/spell.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)spell.c 3.5 2006/06/25 */ +/* SCCS Id: @(#)spell.c 3.5 2006/07/08 */ /* Copyright (c) M. Stephenson 1988 */ /* NetHack may be freely redistributed. See license for details. */ @@ -1216,7 +1216,7 @@ spellsortmenu() tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; i < SIZE(spl_sortchoices); i++) { if (i == SORTRETAINORDER) { @@ -1297,7 +1297,7 @@ int *spell_no; tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ /* * The correct spacing of the columns when not using diff --git a/src/weapon.c b/src/weapon.c index ddc63644d..e20898bf9 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)weapon.c 3.5 2004/10/29 */ +/* SCCS Id: @(#)weapon.c 3.5 2006/07/08 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -902,7 +902,7 @@ enhance_weapon_skill() /* start with a legend if any entries will be annotated with "*" or "#" below */ if (eventually_advance > 0 || maxxed_cnt > 0) { - any.a_void = 0; + any = zeroany; if (eventually_advance > 0) { Sprintf(buf, "(Skill%s flagged by \"*\" may be enhanced %s.)", @@ -932,7 +932,7 @@ enhance_weapon_skill() for (i = skill_ranges[pass].first; i <= skill_ranges[pass].last; i++) { /* Print headings for skill types */ - any.a_void = 0; + any = zeroany; if (i == skill_ranges[pass].first) add_menu(win, NO_GLYPH, &any, 0, 0, iflags.menu_headings, skill_ranges[pass].name, MENU_UNSELECTED); diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 8d1b113e1..3a6a09e40 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -403,7 +403,7 @@ give_up: /* Quit */ /* Prompt for a role */ win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; roles[i].name.m; i++) { if (ok_role(i, flags.initrace, flags.initgend, flags.initalign)) { @@ -491,7 +491,7 @@ give_up: /* Quit */ tty_putstr(BASE_WINDOW, 0, "Choosing Race"); win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; races[i].noun; i++) if (ok_race(flags.initrole, i, flags.initgend, flags.initalign)) { @@ -563,7 +563,7 @@ give_up: /* Quit */ tty_putstr(BASE_WINDOW, 0, "Choosing Gender"); win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; i < ROLE_GENDERS; i++) if (ok_gend(flags.initrole, flags.initrace, i, flags.initalign)) { @@ -634,7 +634,7 @@ give_up: /* Quit */ tty_putstr(BASE_WINDOW, 0, "Choosing Alignment"); win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; i < ROLE_ALIGNS; i++) if (ok_align(flags.initrole, flags.initrace, flags.initgend, i)) { @@ -696,7 +696,7 @@ tty_askname() tty_clear_nhwindow(BASE_WINDOW); tmpwin = create_nhwindow(NHW_MENU); start_menu(tmpwin); - any.a_int = 0; /* no selection */ + any = zeroany; /* no selection */ add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, COPYRIGHT_BANNER_A, MENU_UNSELECTED); add_menu(tmpwin, NO_GLYPH, &any, 0, 0, @@ -2152,7 +2152,7 @@ tty_end_menu(window, prompt) if (prompt) { anything any; - any.a_void = 0; /* not selectable */ + any = zeroany; /* not selectable */ tty_add_menu(window, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED); tty_add_menu(window, NO_GLYPH, &any, 0, 0, ATR_NONE, prompt, MENU_UNSELECTED); } diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index c6c6387dc..ff72df507 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -400,7 +400,7 @@ give_up: /* Quit */ /* Prompt for a role */ win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; roles[i].name.m; i++) { if (ok_role(i, flags.initrace, flags.initgend, flags.initalign)) { @@ -488,7 +488,7 @@ give_up: /* Quit */ /* tty_putstr(BASE_WINDOW, 0, "Choosing Race"); */ win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; races[i].noun; i++) if (ok_race(flags.initrole, i, flags.initgend, flags.initalign)) { @@ -560,7 +560,7 @@ give_up: /* Quit */ /* tty_putstr(BASE_WINDOW, 0, "Choosing Gender"); */ win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; i < ROLE_GENDERS; i++) if (ok_gend(flags.initrole, flags.initrace, i, flags.initalign)) { @@ -631,7 +631,7 @@ give_up: /* Quit */ /* tty_putstr(BASE_WINDOW, 0, "Choosing Alignment"); */ win = create_nhwindow(NHW_MENU); start_menu(win); - any.a_void = 0; /* zero out all bits */ + any = zeroany; /* zero out all bits */ for (i = 0; i < ROLE_ALIGNS; i++) if (ok_align(flags.initrole, flags.initrace, flags.initgend, i)) {