Merge branch 'NetHack-3.6.2'

This commit is contained in:
nhmall
2019-01-29 22:34:07 -05:00
15 changed files with 74 additions and 46 deletions

View File

@@ -225,7 +225,7 @@ mswin_player_selection(void)
flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) {
raw_print("Incompatible role!");
flags.initrole = randrole();
flags.initrole = randrole(FALSE);
}
}
@@ -358,7 +358,7 @@ prompt_for_player_selection(void)
flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) {
/* tty_putstr(BASE_WINDOW, 0, "Incompatible role!"); */
flags.initrole = randrole();
flags.initrole = randrole(FALSE);
}
} else {
/* tty_clear_nhwindow(BASE_WINDOW); */
@@ -396,7 +396,7 @@ prompt_for_player_selection(void)
any.a_int = pick_role(flags.initrace, flags.initgend,
flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */
any.a_int = randrole() + 1;
any.a_int = randrole(FALSE) + 1;
add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
MENU_UNSELECTED);
any.a_int = i + 1; /* must be non-zero */