randrole() fix

Give all the calls to randrole() its new argument.

diff --git a/sys/amiga/winami.c b/sys/amiga/winami.c
index 1819ccde368472da2187874cced7040ac86aa2f6..cd1854eb8b7d4d92328380d80a447223adeecfc3 100644 (file)
--- 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 2c28aa0dcfc53e3f384bcb4ecf7556158263af70..11675000e91ef734b53afe738eed1f2628ed913d 100644 (file)
--- 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 d04c2156c9ef3be5335b0be7865cfc0d298ba1d0..c140a8b58da035a8a75e16d194f026c04f645555 100644 (file)
--- 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 6c5c42b8302e3d698e8b4a37a6829f215e96912d..5f53df4edfbb46865df30c6584da073147493faa 100644 (file)
--- 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 8cd33ca2aea322c387bb8e11f7431af6d57fa1eb..09567cda64321c665e355e18a74699298a9c7515 100644 (file)
--- 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 42152eeb99c87d7b4ee22a02dd0ec96ce2b243be..43e0678915444c0f0c18cd9f2461033967b4878f 100644 (file)
--- 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 50e67c500b26583f3daefb46c941d70609a63304..0cdb63ab536dcfffcd5f521a1de481f021eabaf3 100644 (file)
--- 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 8c37b3fd51667ccc6b10c28a8e6a7bdea8552fa4..b637c463f749f480db1cb719301e90d8a12ecc1a 100644 (file)
--- 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 */