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

This commit is contained in:
Bart House
2018-12-25 16:26:27 -08:00
parent 64be5fd35a
commit 769ad91cc3
48 changed files with 679 additions and 649 deletions

View File

@@ -1237,7 +1237,7 @@ draw_horizontal_new(int x, int y, int hp, int hpmax)
get_playerrank(rank);
char race[BUFSZ];
Strcpy(race, urace.adj);
Strcpy(race, g.urace.adj);
race[0] = highc(race[0]);
wprintw(win, "%s the %s %s%s%s", g.plname,
(u.ualign.type == A_CHAOTIC ? "Chaotic" :

View File

@@ -72,8 +72,6 @@ extern short glyph2tile[];
#define HUPSKIP_RESULT(RES) /*empty*/
#endif /* ?HANGUP_HANDLING */
extern char mapped_menu_cmds[]; /* from options.c */
/* this is only needed until tty_status_* routines are written */
extern NEARDATA winid WIN_STATUS;
@@ -1930,7 +1928,7 @@ struct WinDesc *cw;
Strcat(resp, " "); /* next page or end */
Strcat(resp, "0123456789\033\n\r"); /* counts, quit */
Strcat(resp, gacc); /* group accelerators */
Strcat(resp, mapped_menu_cmds);
Strcat(resp, g.mapped_menu_cmds);
if (cw->npages > 1)
Sprintf(cw->morestr, "(%d of %d)", curr_page + 1,