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

Fix compile when no ENHANCED_SYMBOLS

Browse Source
This commit is contained in:
Ray Chason
2022-10-09 09:04:23 -04:00
parent 613828f5dd
commit ea3d322a11
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/msdos/vidvesa.c
View File

@@ -679,6 +679,7 @@ vesa_xputg(const glyph_info *glyphinfo)
uint32_t attr = (g_attribute == 0) ? attrib_gr_normal : g_attribute; uint32_t attr = (g_attribute == 0) ? attrib_gr_normal : g_attribute;
int ry; int ry;
#ifdef ENHANCED_SYMBOLS
if (SYMHANDLING(H_UTF8) && glyphinfo->gm.u && glyphinfo->gm.u->utf8str) { if (SYMHANDLING(H_UTF8) && glyphinfo->gm.u && glyphinfo->gm.u->utf8str) {
ch = glyphinfo->gm.u->utf32ch; ch = glyphinfo->gm.u->utf32ch;
if (vesa_pixel_size > 8 && glyphinfo->gm.u->ucolor != 0) { if (vesa_pixel_size > 8 && glyphinfo->gm.u->ucolor != 0) {
@@ -687,6 +688,7 @@ vesa_xputg(const glyph_info *glyphinfo)
attr = glyphinfo->gm.u->ucolor | 0x80000000; attr = glyphinfo->gm.u->ucolor | 0x80000000;
} }
} }
#endif
row = currow; row = currow;
col = curcol; col = curcol;
@@ -1075,9 +1077,11 @@ vesa_Init(void)
vesa_SwitchMode(vesa_mode); vesa_SwitchMode(vesa_mode);
vesa_SetViewPort(); vesa_SetViewPort();
windowprocs.win_cliparound = vesa_cliparound; windowprocs.win_cliparound = vesa_cliparound;
#ifdef ENHANCED_SYMBOLS
if (vesa_pixel_size > 8) { if (vesa_pixel_size > 8) {
windowprocs.wincap2 |= WC2_U_24BITCOLOR; windowprocs.wincap2 |= WC2_U_24BITCOLOR;
} }
#endif
#ifdef USE_TILES #ifdef USE_TILES
paletteptr = get_palette(); paletteptr = get_palette();
iflags.tile_view = TRUE; iflags.tile_view = TRUE;

2
sys/msdos/vidvga.c
View File

@@ -373,10 +373,12 @@ vga_xputg(const glyph_info *glyphinfo)
int attr; int attr;
int ry; int ry;
#ifdef ENHANCED_SYMBOLS
if (psf_font != NULL && SYMHANDLING(H_UTF8) && glyphinfo->gm.u if (psf_font != NULL && SYMHANDLING(H_UTF8) && glyphinfo->gm.u
&& glyphinfo->gm.u->utf8str) { && glyphinfo->gm.u->utf8str) {
ch = glyphinfo->gm.u->utf32ch; ch = glyphinfo->gm.u->utf32ch;
} }
#endif
/* If statue glyph, map to the generic statue */ /* If statue glyph, map to the generic statue */
#if 0 #if 0