mthrowu, nhlan, options, regions, rip and role globals moved to g.
This commit is contained in:
10
src/u_init.c
10
src/u_init.c
@@ -625,9 +625,9 @@ u_init()
|
||||
u.umortality = 0;
|
||||
u.ugrave_arise = NON_PM;
|
||||
|
||||
u.umonnum = u.umonster = (flags.female && urole.femalenum != NON_PM)
|
||||
? urole.femalenum
|
||||
: urole.malenum;
|
||||
u.umonnum = u.umonster = (flags.female && g.urole.femalenum != NON_PM)
|
||||
? g.urole.femalenum
|
||||
: g.urole.malenum;
|
||||
u.ulycn = NON_PM;
|
||||
set_uasmon();
|
||||
|
||||
@@ -1047,13 +1047,13 @@ register struct trobj *trop;
|
||||
g.nocreate4 = otyp;
|
||||
}
|
||||
|
||||
if (urace.malenum != PM_HUMAN) {
|
||||
if (g.urace.malenum != PM_HUMAN) {
|
||||
/* substitute race-specific items; this used to be in
|
||||
the 'if (otyp != UNDEF_TYP) { }' block above, but then
|
||||
substitutions didn't occur for randomly generated items
|
||||
(particularly food) which have racial substitutes */
|
||||
for (i = 0; inv_subs[i].race_pm != NON_PM; ++i)
|
||||
if (inv_subs[i].race_pm == urace.malenum
|
||||
if (inv_subs[i].race_pm == g.urace.malenum
|
||||
&& otyp == inv_subs[i].item_otyp) {
|
||||
debugpline3("ini_inv: substituting %s for %s%s",
|
||||
OBJ_NAME(objects[inv_subs[i].subs_otyp]),
|
||||
|
||||
Reference in New Issue
Block a user