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

Revert "some follow-up for MSDOS build"

Browse Source 
This reverts commit 36d3b64326.
This commit is contained in:
nhmall
2022-05-07 14:34:06 -04:00
parent 36d3b64326
commit e4f85df216
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/config.h
View File

@@ -661,10 +661,6 @@ typedef unsigned char uchar;
# endif # endif
#endif #endif
#if defined(MSDOS) && defined(ENHANCED_SYMBOLS)
#undef ENHANCED_SYMBOLS
#endif
#include "integer.h" #include "integer.h"
#include "global.h" /* Define everything else according to choices above */ #include "global.h" /* Define everything else according to choices above */

4
win/share/tilemap.c
View File

@@ -54,10 +54,6 @@ extern void exit(int);
#endif #endif
#endif #endif
#if defined(CROSSCOMPILE) && defined(ENHANCED_SYMBOLS)
#undef ENHANCED_SYMBOLS
#endif
struct { struct {
int idx; int idx;
const char *tilelabel; const char *tilelabel;

11
win/tty/wintty.c
View File

@@ -3417,10 +3417,6 @@ g_putch(int in_ch)
return; return;
} }
#if !defined(NO_TERMS) && !defined(WIN32)
#ifdef ENHANCED_SYMBOLS
void void
g_pututf8(uint8 *utf8str) g_pututf8(uint8 *utf8str)
{ {
@@ -3431,8 +3427,7 @@ g_pututf8(uint8 *utf8str)
} }
return; return;
} }
#endif #endif /* !WIN32 */
#endif /* !NO_TERMS && !WIN32 */
#ifdef CLIPPING #ifdef CLIPPING
void void
@@ -3547,10 +3542,10 @@ tty_print_glyph(winid window, xchar x, xchar y,
if (color != NO_COLOR) if (color != NO_COLOR)
term_start_color(color); term_start_color(color);
#endif /* TEXTCOLOR */ #endif /* TEXTCOLOR */
#if !defined(NO_TERMS) || defined(WIN32)
} }
#endif #endif
} } /* iflags.use_color aka iflags.wc_color */
/* iflags.use_color aka iflags.wc_color */
/* must be after color check; term_end_color may turn off inverse too; /* must be after color check; term_end_color may turn off inverse too;
BW_LAVA and BW_ICE won't ever be set when color is on; BW_LAVA and BW_ICE won't ever be set when color is on;
(tried bold for ice but it didn't look very good; inverse is easier (tried bold for ice but it didn't look very good; inverse is easier