From b43800688741a49b9f66c7f619f0209e979c2d6d Mon Sep 17 00:00:00 2001 From: mogami Date: Fri, 3 May 2002 10:30:37 +0000 Subject: [PATCH] =?utf8?q?-=20=E4=BA=8C=E5=80=8D=E5=B9=85ASCII=E8=A1=A8?= =?utf8?q?=E7=A4=BA=E3=81=A7=E3=80=81=E6=BC=A2=E5=AD=97=E3=81=AE2byte?= =?utf8?q?=E7=9B=AE=E3=81=AEattr(=E8=89=B2=E6=8C=87=E5=AE=9A)=E3=82=92?= =?utf8?q?=E5=8B=9D=E6=89=8B=E3=81=AB255=E3=81=AB=E6=B1=BA=E3=82=81?= =?utf8?q?=E6=89=93=E3=81=A1=E3=81=97=E3=81=A6=20=20=202byte=E7=9B=AE?= =?utf8?q?=E3=81=AE=E8=AD=98=E5=88=A5=E3=81=AB=E4=BD=BF=E3=81=A3=E3=81=A6?= =?utf8?q?=E3=81=84=E3=81=9F=E3=82=89=E3=80=81screen=20dump=E3=81=A7?= =?utf8?q?=E3=81=9D=E3=82=8C=E3=82=92=E7=B4=A0=E7=9B=B4=E3=81=AB=E5=87=BA?= =?utf8?q?=E5=8A=9B=E3=81=97=E3=81=A6=E6=96=87=E5=AD=97=E5=8C=96=E3=81=91?= =?utf8?q?=20=20=20=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7?= =?utf8?q?=E3=80=81=E4=BF=AE=E6=AD=A3=E3=80=82255=E3=81=AB=E3=81=9B?= =?utf8?q?=E3=81=9A=E3=80=810xf0=E3=82=92=E5=8A=A0=E3=81=88=E3=82=8B?= =?utf8?q?=E3=81=A0=E3=81=91=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82=20-=20?= =?utf8?q?=E3=81=95=E3=82=89=E3=81=AB=E3=80=81win=E7=89=88=E3=81=A7?= =?utf8?q?=E4=BA=8C=E5=80=8D=E5=B9=85=E8=B1=86=E8=85=90=E3=81=AE=E5=86=85?= =?utf8?q?=E9=83=A8=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AB=E4=BD=BF=E3=81=A3?= =?utf8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=80=8C=E2=84=AB=E3=80=8D=E3=82=82?= =?utf8?q?=E3=81=9D=E3=81=AE=E3=81=BE=E3=81=BE=E5=87=BA=E5=8A=9B=20=20=20?= =?utf8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE=E3=81=84=E3=81=9D?= =?utf8?q?=E3=81=86=E3=81=AA=E3=81=AE=E3=81=A7=E3=80=81=E4=BB=A3=E3=82=8A?= =?utf8?q?=E3=81=AB=E3=80=8C=E2=96=A0=E3=80=8D=E3=82=92=E4=BD=BF=E3=81=86?= =?utf8?q?=E4=BA=8B=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82=20=20=20=E6=9C=AC?= =?utf8?q?=E5=BD=93=E3=81=AF=E5=87=BA=E5=8A=9B=E6=99=82=E3=81=AB=E3=80=8C?= =?utf8?q?=EF=BC=83=E3=80=8D=E3=81=AB=E7=BD=AE=E3=81=8D=E5=A4=89=E3=81=88?= =?utf8?q?=E3=82=8B=E3=81=AE=E3=81=8C=E4=B8=80=E7=95=AA=E3=81=84=E3=81=84?= =?utf8?q?=E3=81=8C=E3=80=81=E3=81=AA=E3=82=93=E3=81=8B=E3=82=B3=E3=83=BC?= =?utf8?q?=E3=83=89=E3=81=AE=E9=83=BD=E5=90=88=E4=B8=8A=20=20=20=E5=A4=A7?= =?utf8?q?=E3=81=8C=E3=81=8B=E3=82=8A=E3=81=AA=E3=83=8F=E3=83=83=E3=82=AF?= =?utf8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?= =?utf8?q?=E3=81=AE=E3=81=A7=E3=82=84=E3=82=81=E3=81=A6=E3=81=8A=E3=81=8F?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cave.c | 6 +++--- src/main-win.c | 2 +- src/z-term.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cave.c b/src/cave.c index 964cf7d1a..4476d96be 100644 --- a/src/cave.c +++ b/src/cave.c @@ -1747,7 +1747,7 @@ void map_info(int y, int x, byte *ap, char *cp) #ifdef JP /* * Table of Ascii-to-Zenkaku - * ¡Ö¢ò¡×¤ÏÆóÇÜÉýƦÉå¤ÎÆâÉô¥³¡¼¥É¤Ë»ÈÍÑ¡£ + * ¡Ö¢£¡×¤ÏÆóÇÜÉýƦÉå¤ÎÆâÉô¥³¡¼¥É¤Ë»ÈÍÑ¡£ */ static char ascii_to_zenkaku[2*128+1] = "\ ¡¡¡ª¡É¡ô¡ð¡ó¡õ¡Ç¡Ê¡Ë¡ö¡Ü¡¤¡Ý¡¥¡¿\ @@ -1755,7 +1755,7 @@ static char ascii_to_zenkaku[2*128+1] = "\ ¡÷£Á£Â£Ã£Ä£Å£Æ£Ç£È£É£Ê£Ë£Ì£Í£Î£Ï\ £Ð£Ñ£Ò£Ó£Ô£Õ£Ö£×£Ø£Ù£Ú¡Î¡À¡Ï¡°¡²\ ¡Æ£á£â£ã£ä£å£æ£ç£è£é£ê£ë£ì£í£î£ï\ -£ð£ñ£ò£ó£ô£õ£ö£÷£ø£ù£ú¡Ð¡Ã¡Ñ¡Á¢ò"; +£ð£ñ£ò£ó£ô£õ£ö£÷£ø£ù£ú¡Ð¡Ã¡Ñ¡Á¢£"; #endif /* @@ -1773,7 +1773,7 @@ static void bigtile_attr(char *cp, byte *ap, char *cp2, byte *ap2) #ifdef JP if (isprint(*cp) || *cp == 127) { - *ap2 = 255; + *ap2 = (*ap) | 0xf0; *cp2 = ascii_to_zenkaku[2*(*cp-' ') + 1]; *cp = ascii_to_zenkaku[2*(*cp-' ')]; return; diff --git a/src/main-win.c b/src/main-win.c index baf2acad3..124891f77 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -2357,7 +2357,7 @@ static errr Term_text_win(int x, int y, int n, byte a, const char *s) for (i = 0; i < n; i++) { #ifdef JP - if (use_bigtile && *(s+i)=="¢ò"[0] && *(s+i+1)=="¢ò"[1]) + if (use_bigtile && *(s+i)=="¢£"[0] && *(s+i+1)=="¢£"[1]) { rc.right += td->font_wid; diff --git a/src/z-term.c b/src/z-term.c index 120b3d30a..e3017047a 100644 --- a/src/z-term.c +++ b/src/z-term.c @@ -570,7 +570,7 @@ void Term_queue_char(int x, int y, byte a, char c) if (x < Term->x1[y]) Term->x1[y] = x; if (x > Term->x2[y]) Term->x2[y] = x; - if (scrn->a[y][x] == 255) + if ((scrn->a[y][x] & 0xf0) == 0xf0) if ((x - 1) < Term->x1[y]) Term->x1[y]--; } @@ -1156,7 +1156,7 @@ static void Term_fresh_row_both(int y, int x1, int x2) #endif /* USE_TRANSPARENCY */ /* 2nd byte of bigtile */ - if (na == 255) continue; + if ((na & 0xf0) == 0xf0) continue; /* Handle high-bit attr/chars */ if ((na & 0x80) && (nc & 0x80)) -- 2.11.0