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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-09 07:24:18 -05:00
parent 7eee5f3a1d 624aee7749
commit 58f2218c4e
39 changed files with 239 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
win/tty/wintty.c
View File

@@ -522,7 +522,7 @@ tty_player_selection()
setup_rolemenu(win, TRUE, RACE, GEND, ALGN);
/* add miscellaneous menu entries */
role_menu_extra(ROLE_RANDOM, win, TRUE);
any = g.zeroany; /* separator, not a choice */
any = cg.zeroany; /* separator, not a choice */
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "",
MENU_UNSELECTED);
role_menu_extra(RS_RACE, win, FALSE);
@@ -616,7 +616,7 @@ tty_player_selection()
role_selection_prolog(RS_RACE, BASE_WINDOW);
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
/* populate the menu with role choices */
setup_racemenu(win, TRUE, ROLE, GEND, ALGN);
/* add miscellaneous menu entries */
@@ -709,7 +709,7 @@ tty_player_selection()
role_selection_prolog(RS_GENDER, BASE_WINDOW);
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
/* populate the menu with gender choices */
setup_gendmenu(win, TRUE, ROLE, RACE, ALGN);
/* add miscellaneous menu entries */
@@ -800,7 +800,7 @@ tty_player_selection()
role_selection_prolog(RS_ALGNMNT, BASE_WINDOW);
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
setup_algnmenu(win, TRUE, ROLE, RACE, GEND);
role_menu_extra(ROLE_RANDOM, win, TRUE);
any.a_int = 0; /* separator, not a choice */
@@ -880,7 +880,7 @@ tty_player_selection()
role_selection_prolog(ROLE_NONE, BASE_WINDOW);
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
any.a_int = 0;
if (!roles[ROLE].name.f
&& (roles[ROLE].allow & ROLE_GENDMASK)
@@ -982,7 +982,7 @@ reset_role_filtering()
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany;
any = cg.zeroany;
/* no extra blank line preceding this entry; end_menu supplies one */
add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
@@ -1037,7 +1037,7 @@ int race, gend, algn; /* all ROLE_NONE for !filtering case */
boolean role_ok;
char thisch, lastch = '\0', rolenamebuf[50];
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
for (i = 0; roles[i].name.m; i++) {
role_ok = ok_role(i, race, gend, algn);
if (filtering && !role_ok)
@@ -1080,7 +1080,7 @@ int role, gend, algn;
int i;
char this_ch;
any = g.zeroany;
any = cg.zeroany;
for (i = 0; races[i].noun; i++) {
race_ok = ok_race(role, i, gend, algn);
if (filtering && !race_ok)
@@ -1113,7 +1113,7 @@ int role, race, algn;
int i;
char this_ch;
any = g.zeroany;
any = cg.zeroany;
for (i = 0; i < ROLE_GENDERS; i++) {
gend_ok = ok_gend(role, race, i, algn);
if (filtering && !gend_ok)
@@ -1144,7 +1144,7 @@ int role, race, gend;
int i;
char this_ch;
any = g.zeroany;
any = cg.zeroany;
for (i = 0; i < ROLE_ALIGNS; i++) {
algn_ok = ok_align(role, race, gend, i);
if (filtering && !algn_ok)
@@ -2904,7 +2904,7 @@ const char *prompt; /* prompt to for menu */
if (prompt) {
anything any;
any = g.zeroany; /* not selectable */
any = cg.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,

8
win/win32/mswproc.c
View File

@@ -403,7 +403,7 @@ prompt_for_player_selection(void)
/* Prompt for a role */
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
for (i = 0; roles[i].name.m; i++) {
if (ok_role(i, flags.initrace, flags.initgend,
flags.initalign)) {
@@ -495,7 +495,7 @@ prompt_for_player_selection(void)
/* tty_putstr(BASE_WINDOW, 0, "Choosing Race"); */
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
for (i = 0; races[i].noun; i++)
if (ok_race(flags.initrole, i, flags.initgend,
flags.initalign)) {
@@ -569,7 +569,7 @@ prompt_for_player_selection(void)
/* tty_putstr(BASE_WINDOW, 0, "Choosing Gender"); */
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
for (i = 0; i < ROLE_GENDERS; i++)
if (ok_gend(flags.initrole, flags.initrace, i,
flags.initalign)) {
@@ -642,7 +642,7 @@ prompt_for_player_selection(void)
/* tty_putstr(BASE_WINDOW, 0, "Choosing Alignment"); */
win = create_nhwindow(NHW_MENU);
start_menu(win);
any = g.zeroany; /* zero out all bits */
any = cg.zeroany; /* zero out all bits */
for (i = 0; i < ROLE_ALIGNS; i++)
if (ok_align(flags.initrole, flags.initrace,
flags.initgend, i)) {