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

15
src/role.c
View File

@@ -728,9 +728,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
@@ -746,7 +753,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
@@ -2021,7 +2028,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 (!g.urole.lgod) {
g.urole.lgod = roles[flags.pantheon].lgod;