nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Moved more globals to instance_globals.

Browse Source
This commit is contained in:
Bart House
2018-11-24 02:13:54 -08:00
parent f1e48cddfe
commit 3645e415e3
37 changed files with 987 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win/curses/cursinit.c
View File

@@ -791,7 +791,7 @@ curses_init_options()
/* Make sure that DECgraphics is not set to true via the config
file, as this will cause display issues. We can't disable it in
options.c in case the game is compiled with both tty and curses. */
if (!symset[PRIMARY].name || !strcmpi(symset[PRIMARY].name, "DECgraphics")) {
if (!g.symset[PRIMARY].name || !strcmpi(g.symset[PRIMARY].name, "DECgraphics")) {
load_symset("curses",PRIMARY);
load_symset("default",ROGUESET);
}

2
win/curses/cursmain.c
View File

@@ -590,7 +590,7 @@ curses_print_glyph(winid wid, XCHAR_P x, XCHAR_P y, int glyph, int bkglyph)
if ((special & MG_DETECT) && iflags.use_inverse) {
attr = A_REVERSE;
}
if (!symset[PRIMARY].name || !strcmpi(symset[PRIMARY].name, "curses")) {
if (!g.symset[PRIMARY].name || !strcmpi(g.symset[PRIMARY].name, "curses")) {
ch = curses_convert_glyph(ch, glyph);
}
if (wid == NHW_MAP) {

2
win/curses/cursmisc.c
View File

@@ -454,7 +454,7 @@ curses_convert_glyph(int ch, int glyph)
/* If user selected a custom character for this object, don't
override this. */
if (((glyph_is_cmap(glyph)) && (ch != showsyms[symbol]))) {
if (((glyph_is_cmap(glyph)) && (ch != g.showsyms[symbol]))) {
return ch;
}