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-29 22:34:07 -05:00
parent b367b4e868 02532667a9
commit 05ec7f36a8
15 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amiga/winami.c
View File

@@ -451,7 +451,7 @@ amii_player_selection()
if (validrole(flags.initrole))
return;
else {
flags.initrole=randrole();
flags.initrole = randrole(FALSE);
return;
}
#if 0 /* Don't query the user ... instead give random character -jhsa */
@@ -518,7 +518,7 @@ amii_player_selection()
}
else if( code == ' ' || code == '\n' || code == '\r' )
{
flags.initrole = randrole();
flags.initrole = randrole(FALSE);
#if 0 /* OBSOLETE */
strcpy( g.pl_character, roles[ rnd( 11 ) ] );
#endif
@@ -543,7 +543,7 @@ amii_player_selection()
switch( gd->GadgetID )
{
case 1: /* Random Character */
flags.initrole = randrole();
flags.initrole = randrole(FALSE);
#if 0 /* OBSOLETE */
strcpy( g.pl_character, roles[ rnd( 11 ) ] );
#endif
@@ -1380,7 +1380,7 @@ amii_player_selection()
flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) {
amii_putstr(WIN_MESSAGE, 0, "Incompatible role!");
flags.initrole = randrole();
flags.initrole = randrole(FALSE);
}
} else {
/* Prompt for a role */
@@ -1416,7 +1416,7 @@ amii_player_selection()
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 */

2
sys/mac/macmenu.c
View File

@@ -549,7 +549,7 @@ mac_askname()
currrole = flags.initrole;
/* Check for backward compatibility */
else if ((currrole = str2role(g.pl_character)) < 0)
currrole = randrole();
currrole = randrole(FALSE);
/* Initialize the race popup menu */
if (!(askmenu[RSRC_ASK_RACE] = NewMenu(RSRC_ASK_RACE, "\p")))

8
sys/unix/unixmain.c
View File

@@ -768,18 +768,18 @@ error:
unsigned long
sys_random_seed()
{
unsigned long seed;
unsigned long seed = 0L;
unsigned long pid = (unsigned long) getpid();
boolean no_seed = TRUE;
#ifdef DEV_RANDOM
FILE *fptr = NULL;
FILE *fptr;
fptr = fopen(DEV_RANDOM, "r");
if (fptr) {
fread(&seed, sizeof(long), 1, fptr);
fread(&seed, sizeof (long), 1, fptr);
has_strong_rngseed = TRUE; /* decl.c */
no_seed = FALSE;
fclose(fptr);
(void) fclose(fptr);
} else {
/* leaves clue, doesn't exit */
paniclog("sys_random_seed", "falling back to weak seed");

6
sys/wince/mswproc.c
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 */