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/wield.c
+++ b/src/wield.c
@@ -606,8 +606,8 @@ can_twoweapon()
            You_cant("use two weapons in your current form.");
        else
            pline("%s aren't able to use two weapons at once.",
-                  makeplural((flags.female && urole.name.f) ? urole.name.f
-                                                            : urole.name.m));
+                  makeplural((flags.female && g.urole.name.f) ? g.urole.name.f
+                                                            : g.urole.name.m));
    } else if (!uwep || !uswapwep)
        Your("%s%s%s empty.", uwep ? "left " : uswapwep ? "right " : "",
             body_part(HAND), (!uwep && !uswapwep) ? "s are" : " is");