From 37e5a9cad2db6800c516d0e79a92df674749886c Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 29 Jan 2019 17:14:55 -0800 Subject: [PATCH] randrole() fix Give all the calls to randrole() its new argument. --- sys/amiga/winami.c | 10 +++++----- sys/mac/macmenu.c | 2 +- sys/wince/mswproc.c | 6 +++--- win/curses/cursinit.c | 2 +- win/gem/wingem.c | 4 ++-- win/gnome/gnbind.c | 2 +- win/tty/wintty.c | 4 ++-- win/win32/mswproc.c | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/amiga/winami.c b/sys/amiga/winami.c index 1819ccde3..cd1854eb8 100644 --- a/sys/amiga/winami.c +++ b/sys/amiga/winami.c @@ -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( 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( 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 */ diff --git a/sys/mac/macmenu.c b/sys/mac/macmenu.c index 2c28aa0dc..11675000e 100644 --- a/sys/mac/macmenu.c +++ b/sys/mac/macmenu.c @@ -549,7 +549,7 @@ mac_askname() currrole = flags.initrole; /* Check for backward compatibility */ else if ((currrole = str2role(pl_character)) < 0) - currrole = randrole(); + currrole = randrole(FALSE); /* Initialize the race popup menu */ if (!(askmenu[RSRC_ASK_RACE] = NewMenu(RSRC_ASK_RACE, "\p"))) diff --git a/sys/wince/mswproc.c b/sys/wince/mswproc.c index d04c2156c..c140a8b58 100644 --- a/sys/wince/mswproc.c +++ b/sys/wince/mswproc.c @@ -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 */ diff --git a/win/curses/cursinit.c b/win/curses/cursinit.c index 6c5c42b83..5f53df4ed 100644 --- a/win/curses/cursinit.c +++ b/win/curses/cursinit.c @@ -543,7 +543,7 @@ curses_choose_character() sel = pick_role(flags.initrace, flags.initgend, flags.initalign, PICK_RANDOM); if (sel < 0) - sel = randrole(); + sel = randrole(FALSE); } flags.initrole = sel; diff --git a/win/gem/wingem.c b/win/gem/wingem.c index 8cd33ca2a..09567cda6 100644 --- a/win/gem/wingem.c +++ b/win/gem/wingem.c @@ -234,7 +234,7 @@ Gem_player_selection() if (flags.initrole < 0) { mar_add_message("Incompatible role!"); mar_display_nhwindow(WIN_MESSAGE); - flags.initrole = randrole(); + flags.initrole = randrole(FALSE); } } else { /* Prompt for a role */ @@ -256,7 +256,7 @@ Gem_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 */ diff --git a/win/gnome/gnbind.c b/win/gnome/gnbind.c index 42152eeb9..43e067891 100644 --- a/win/gnome/gnbind.c +++ b/win/gnome/gnbind.c @@ -159,7 +159,7 @@ gnome_player_selection() sel = pick_role(flags.initrace, flags.initgend, flags.initalign, PICK_RANDOM); if (sel < 0) - sel = randrole(); + sel = randrole(FALSE); } flags.initrole = sel; diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 50e67c500..0cdb63ab5 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -512,7 +512,7 @@ tty_player_selection() k = pick_role(RACE, GEND, ALGN, PICK_RANDOM); if (k < 0) { tty_putstr(BASE_WINDOW, 0, "Incompatible role!"); - k = randrole(); + k = randrole(FALSE); } } else { /* Prompt for a role */ @@ -574,7 +574,7 @@ tty_player_selection() } else if (choice == ROLE_RANDOM) { k = pick_role(RACE, GEND, ALGN, PICK_RANDOM); if (k < 0) - k = randrole(); + k = randrole(FALSE); } else { k = choice - 1; } diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index 8c37b3fd5..b637c463f 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -271,7 +271,7 @@ mswin_player_selection(void) flags.initalign, PICK_RANDOM); if (flags.initrole < 0) { raw_print("Incompatible role!"); - flags.initrole = randrole(); + flags.initrole = randrole(FALSE); } } @@ -395,7 +395,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); */ @@ -433,7 +433,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 */ -- 2.49.0