From 1b49f60ded6b11b51667c48dd714fdf4264ccff0 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Tue, 29 Jan 2019 15:00:07 -0800
Subject: [PATCH] warning fix

The new code provoked several warnings; this fixes one of them.
Moving the declaration of 'rolecount' would have been sufficient,
but I've gone another way.
---
 include/extern.h |  2 +-
 src/pray.c       | 14 ++++++--------
 src/role.c       | 15 +++++++++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/include/extern.h b/include/extern.h
index f67d09c85..6b5da1758 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -2122,7 +2122,7 @@ E boolean FDECL(validrole, (int));
 E boolean FDECL(validrace, (int, int));
 E boolean FDECL(validgend, (int, int, int));
 E boolean FDECL(validalign, (int, int, int));
-E int NDECL(randrole);
+E int FDECL(randrole, (BOOLEAN_P));
 E int FDECL(randrace, (int));
 E int FDECL(randgend, (int, int));
 E int FDECL(randalign, (int, int));
diff --git a/src/pray.c b/src/pray.c
index ff9532fbd..29cf878a4 100644
--- a/src/pray.c
+++ b/src/pray.c
@@ -2095,15 +2095,13 @@ aligntyp alignment;
     if (!Hallucination)
         return align_gname(alignment);
 
-    /* Count the roles, so that we can pick one at random. */
-    int rolecount = 0;
-    while (roles[rolecount].filecode)
-        rolecount++;
-
-    /* The priest may not have initialized god names. If this is the
-       case, and we roll priest, we need to try again. */
+    /* Some roles (Priest) don't have a pantheon unless we're playing as
+       that role, so keep trying until we get a role which does have one.
+       [If playing a Priest, the current pantheon will be twice as likely
+       to get picked as any of the others.  That's not significant enough
+       to bother dealing with.] */
     do
-        which = rn2_on_display_rng(rolecount);
+        which = randrole(TRUE);
     while (!roles[which].lgod);
 
     switch (rn2_on_display_rng(9)) {
diff --git a/src/role.c b/src/role.c
index 2a2acce53..f263609a1 100644
--- a/src/role.c
+++ b/src/role.c
@@ -787,9 +787,16 @@ int rolenum;
 }
 
 int
-randrole()
+randrole(for_display)
+boolean for_display;
 {
-    return rn2(SIZE(roles) - 1);
+    int res = SIZE(roles) - 1;
+
+    if (for_display)
+        res = rn2_on_display_rng(res);
+    else
+        res = rn2(res);
+    return res;
 }
 
 STATIC_OVL int
@@ -805,7 +812,7 @@ randrole_filtered()
             && ok_gend(i, ROLE_NONE, ROLE_RANDOM, ROLE_NONE)
             && ok_align(i, ROLE_NONE, ROLE_NONE, ROLE_RANDOM))
             set[n++] = i;
-    return n ? set[rn2(n)] : randrole();
+    return n ? set[rn2(n)] : randrole(FALSE);
 }
 
 int
@@ -2088,7 +2095,7 @@ role_init()
     if (flags.pantheon == -1) {             /* new game */
         flags.pantheon = flags.initrole;    /* use own gods */
         while (!roles[flags.pantheon].lgod) /* unless they're missing */
-            flags.pantheon = randrole();
+            flags.pantheon = randrole(FALSE);
     }
     if (!urole.lgod) {
         urole.lgod = roles[flags.pantheon].lgod;
-- 
2.40.0