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

randrole() fix

Browse Source 
Give all the calls to randrole() its new argument.
This commit is contained in:
PatR
2019-01-29 17:14:55 -08:00
parent d32b2c8188
commit 37e5a9cad2
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/amiga/winami.c
+5 -5
View File
@@ -451,7 +451,7 @@ amii_player_selection()
if (validrole(flags.initrole)) if (validrole(flags.initrole))
return; return;
else { else {
flags.initrole=randrole(); flags.initrole = randrole(FALSE);
return; return;
} }
#if 0 /* Don't query the user ... instead give random character -jhsa */ #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' ) else if( code == ' ' || code == '\n' || code == '\r' )
{ {
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
#if 0 /* OBSOLETE */ #if 0 /* OBSOLETE */
strcpy( pl_character, roles[ rnd( 11 ) ] ); strcpy( pl_character, roles[ rnd( 11 ) ] );
#endif #endif
@@ -543,7 +543,7 @@ amii_player_selection()
switch( gd->GadgetID ) switch( gd->GadgetID )
{ {
case 1: /* Random Character */ case 1: /* Random Character */
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
#if 0 /* OBSOLETE */ #if 0 /* OBSOLETE */
strcpy( pl_character, roles[ rnd( 11 ) ] ); strcpy( pl_character, roles[ rnd( 11 ) ] );
#endif #endif
@@ -1380,7 +1380,7 @@ amii_player_selection()
flags.initalign, PICK_RANDOM); flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) { if (flags.initrole < 0) {
amii_putstr(WIN_MESSAGE, 0, "Incompatible role!"); amii_putstr(WIN_MESSAGE, 0, "Incompatible role!");
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
} }
} else { } else {
/* Prompt for a role */ /* Prompt for a role */
@@ -1416,7 +1416,7 @@ amii_player_selection()
any.a_int = pick_role(flags.initrace, flags.initgend, any.a_int = pick_role(flags.initrace, flags.initgend,
flags.initalign, PICK_RANDOM) + 1; flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */ 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", add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
MENU_UNSELECTED); MENU_UNSELECTED);
any.a_int = i + 1; /* must be non-zero */ any.a_int = i + 1; /* must be non-zero */
sys/mac/macmenu.c
+1 -1
View File
@@ -549,7 +549,7 @@ mac_askname()
currrole = flags.initrole; currrole = flags.initrole;
/* Check for backward compatibility */ /* Check for backward compatibility */
else if ((currrole = str2role(pl_character)) < 0) else if ((currrole = str2role(pl_character)) < 0)
currrole = randrole(); currrole = randrole(FALSE);
/* Initialize the race popup menu */ /* Initialize the race popup menu */
if (!(askmenu[RSRC_ASK_RACE] = NewMenu(RSRC_ASK_RACE, "\p"))) if (!(askmenu[RSRC_ASK_RACE] = NewMenu(RSRC_ASK_RACE, "\p")))
sys/wince/mswproc.c
+3 -3
View File
@@ -225,7 +225,7 @@ mswin_player_selection(void)
flags.initalign, PICK_RANDOM); flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) { if (flags.initrole < 0) {
raw_print("Incompatible role!"); raw_print("Incompatible role!");
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
} }
} }
@@ -358,7 +358,7 @@ prompt_for_player_selection(void)
flags.initalign, PICK_RANDOM); flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) { if (flags.initrole < 0) {
/* tty_putstr(BASE_WINDOW, 0, "Incompatible role!"); */ /* tty_putstr(BASE_WINDOW, 0, "Incompatible role!"); */
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
} }
} else { } else {
/* tty_clear_nhwindow(BASE_WINDOW); */ /* tty_clear_nhwindow(BASE_WINDOW); */
@@ -396,7 +396,7 @@ prompt_for_player_selection(void)
any.a_int = pick_role(flags.initrace, flags.initgend, any.a_int = pick_role(flags.initrace, flags.initgend,
flags.initalign, PICK_RANDOM) + 1; flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */ 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", add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
MENU_UNSELECTED); MENU_UNSELECTED);
any.a_int = i + 1; /* must be non-zero */ any.a_int = i + 1; /* must be non-zero */
win/curses/cursinit.c
+1 -1
View File
@@ -543,7 +543,7 @@ curses_choose_character()
sel = pick_role(flags.initrace, flags.initgend, sel = pick_role(flags.initrace, flags.initgend,
flags.initalign, PICK_RANDOM); flags.initalign, PICK_RANDOM);
if (sel < 0) if (sel < 0)
sel = randrole(); sel = randrole(FALSE);
} }
flags.initrole = sel; flags.initrole = sel;
win/gem/wingem.c
+2 -2
View File
@@ -234,7 +234,7 @@ Gem_player_selection()
if (flags.initrole < 0) { if (flags.initrole < 0) {
mar_add_message("Incompatible role!"); mar_add_message("Incompatible role!");
mar_display_nhwindow(WIN_MESSAGE); mar_display_nhwindow(WIN_MESSAGE);
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
} }
} else { } else {
/* Prompt for a role */ /* Prompt for a role */
@@ -256,7 +256,7 @@ Gem_player_selection()
any.a_int = pick_role(flags.initrace, flags.initgend, any.a_int = pick_role(flags.initrace, flags.initgend,
flags.initalign, PICK_RANDOM) + 1; flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */ 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", add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
MENU_UNSELECTED); MENU_UNSELECTED);
any.a_int = i + 1; /* must be non-zero */ any.a_int = i + 1; /* must be non-zero */
win/gnome/gnbind.c
+1 -1
View File
@@ -159,7 +159,7 @@ gnome_player_selection()
sel = pick_role(flags.initrace, flags.initgend, flags.initalign, sel = pick_role(flags.initrace, flags.initgend, flags.initalign,
PICK_RANDOM); PICK_RANDOM);
if (sel < 0) if (sel < 0)
sel = randrole(); sel = randrole(FALSE);
} }
flags.initrole = sel; flags.initrole = sel;
win/tty/wintty.c
+2 -2
View File
@@ -512,7 +512,7 @@ tty_player_selection()
k = pick_role(RACE, GEND, ALGN, PICK_RANDOM); k = pick_role(RACE, GEND, ALGN, PICK_RANDOM);
if (k < 0) { if (k < 0) {
tty_putstr(BASE_WINDOW, 0, "Incompatible role!"); tty_putstr(BASE_WINDOW, 0, "Incompatible role!");
k = randrole(); k = randrole(FALSE);
} }
} else { } else {
/* Prompt for a role */ /* Prompt for a role */
@@ -574,7 +574,7 @@ tty_player_selection()
} else if (choice == ROLE_RANDOM) { } else if (choice == ROLE_RANDOM) {
k = pick_role(RACE, GEND, ALGN, PICK_RANDOM); k = pick_role(RACE, GEND, ALGN, PICK_RANDOM);
if (k < 0) if (k < 0)
k = randrole(); k = randrole(FALSE);
} else { } else {
k = choice - 1; k = choice - 1;
} }
win/win32/mswproc.c
+3 -3
View File
@@ -271,7 +271,7 @@ mswin_player_selection(void)
flags.initalign, PICK_RANDOM); flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) { if (flags.initrole < 0) {
raw_print("Incompatible role!"); raw_print("Incompatible role!");
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
} }
} }
@@ -395,7 +395,7 @@ prompt_for_player_selection(void)
flags.initalign, PICK_RANDOM); flags.initalign, PICK_RANDOM);
if (flags.initrole < 0) { if (flags.initrole < 0) {
/* tty_putstr(BASE_WINDOW, 0, "Incompatible role!"); */ /* tty_putstr(BASE_WINDOW, 0, "Incompatible role!"); */
flags.initrole = randrole(); flags.initrole = randrole(FALSE);
} }
} else { } else {
/* tty_clear_nhwindow(BASE_WINDOW); */ /* tty_clear_nhwindow(BASE_WINDOW); */
@@ -433,7 +433,7 @@ prompt_for_player_selection(void)
any.a_int = pick_role(flags.initrace, flags.initgend, any.a_int = pick_role(flags.initrace, flags.initgend,
flags.initalign, PICK_RANDOM) + 1; flags.initalign, PICK_RANDOM) + 1;
if (any.a_int == 0) /* must be non-zero */ 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", add_menu(win, NO_GLYPH, &any, '*', 0, ATR_NONE, "Random",
MENU_UNSELECTED); MENU_UNSELECTED);
any.a_int = i + 1; /* must be non-zero */ any.a_int = i + 1; /* must be non-zero */