From aed3d37e17ca3d7d2e7492f92b01839630724bb9 Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Wed, 18 Oct 2006 04:10:43 +0000 Subject: [PATCH] more unicode follow up Set the unicode restriction bit when loading a symset when appropriate, and a win32 console refinement. --- src/files.c | 2 ++ sys/winnt/nttty.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/files.c b/src/files.c index 1dffde979..74ba5c7b7 100644 --- a/src/files.c +++ b/src/files.c @@ -2651,6 +2651,8 @@ int which_set; break; case 1: symset[which_set].rogue = 1; break; + case 2: symset[which_set].unicode = 1; + break; } break; /* while loop */ } diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c index 412d37747..368c42af9 100644 --- a/sys/winnt/nttty.c +++ b/sys/winnt/nttty.c @@ -611,7 +611,8 @@ int in_sym; cursor.Y = ttyDisplay->cury; WriteConsoleOutputAttribute(hConOut,&attr,1,cursor,&acount); #ifdef UNICODE_DRAWING - if (symset[currentgraphics].name && iflags.unicodedisp) + if (symset[currentgraphics].name && + symset[currentgraphics].unicode && iflags.unicodedisp) WriteConsoleOutputCharacterW(hConOut,(LPCWSTR)&in_sym,1,cursor,&ccount); else #endif