mthrowu, nhlan, options, regions, rip and role globals moved to g.

2018-12-25 16:26:27 -08:00
parent 64be5fd35a
commit 769ad91cc3
48 changed files with 679 additions and 649 deletions
--- a/src/mon.c
+++ b/src/mon.c
@@ -3323,7 +3323,7 @@ struct monst *mon;
        } else if (!rn2(3)) { /* quest guardians */
            mndx = rn1(PM_APPRENTICE - PM_STUDENT + 1, PM_STUDENT);
            /* avoid own role's guardian */
-            if (mndx == urole.guardnum)
+            if (mndx == g.urole.guardnum)
                mndx = NON_PM;
        } else { /* general humanoids */
            tryct = 5;