From cecb0e7d237086ea0be4591603612ddd6c4127d7 Mon Sep 17 00:00:00 2001 From: mogami Date: Sun, 7 Sep 2003 16:43:21 +0000 Subject: [PATCH] =?utf8?q?=E6=96=87=E5=AD=97=E3=82=B3=E3=83=BC=E3=83=89?= =?utf8?q?=E3=81=AE=E5=88=A4=E5=AE=9A=E3=81=AE=E3=83=9F=E3=82=B9=E3=82=92?= =?utf8?q?=E6=B8=9B=E3=82=89=E3=81=97=E3=81=9F=E3=80=82=E3=83=A1=E3=83=83?= =?utf8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E5=B1=A5=E6=AD=B4=E3=82=92=E3=83=AD?= =?utf8?q?=E3=83=BC=E3=83=89=E3=81=97=E3=81=9F=E6=AE=B5=E9=9A=8E=E3=81=A7E?= =?utf8?q?UC=E3=81=A7=E7=84=A1=E3=81=84=E4=BA=8B=E3=82=92=E5=88=A4?= =?utf8?q?=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8C=E3=81=B0=E4=BB=A5=E9=99=8D?= =?utf8?q?=E3=81=AFSJIS=E3=82=92=E4=BB=AE=E5=AE=9A=E3=81=99=E3=82=8B?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 2 +- src/japanese.c | 10 ++++++++-- src/load.c | 3 ++- src/scores.c | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/externs.h b/src/externs.h index 8b895e233..590ef6715 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1541,7 +1541,7 @@ extern void jverb2( const char *in , char *out); extern void jverb3( const char *in , char *out); extern void jverb( const char *in , char *out , int flag); extern char* strstr_j(cptr str1, cptr str2); -extern void codeconv(char *str); +extern void codeconv(char *str, bool unknown); extern bool iskanji2(cptr s, int x); #endif diff --git a/src/japanese.c b/src/japanese.c index 0c2b1bfa7..7c61f5da2 100644 --- a/src/japanese.c +++ b/src/japanese.c @@ -146,14 +146,20 @@ char* strstr_j(const char* s, const char* t) * str¤ò´Ä¶­¤Ë¹ç¤Ã¤¿Ê¸»ú¥³¡¼¥É¤ËÊÑ´¹¤¹¤ë¡£ * str¤ÎŤµ¤ËÀ©¸Â¤Ï¤Ê¤¤¡£ */ -void codeconv(char *str) +void codeconv(char *str, bool unknown) { + /* EUC¤ò²¾Äê¡£ */ + static bool iseuc = 1; + int i; - int kanji = 0, iseuc = 1; + int kanji = 0; int len; unsigned char c1, c2; unsigned char *tmp; + /* ʸ»ú¥³¡¼¥É¤¬ÊѤï¤ë²ÄǽÀ­¤¬¤¢¤ë»þ¤Ï¡¢º£¤Þ¤Ç¤Î¾ðÊó¤ò˺¤ì¤ë¡£ */ + if (unknown) iseuc = 1; + /* ´Á»ú¤¬Â¸ºß¤·¡¢¤½¤Î´Á»ú¥³¡¼¥É¤¬EUC¤«¤É¤¦¤«Ä´¤Ù¤ë¡£*/ for (i = 0; str[i]; i++) { diff --git a/src/load.c b/src/load.c index fe102c977..ea41235e3 100644 --- a/src/load.c +++ b/src/load.c @@ -221,7 +221,8 @@ static void rd_string(char *str, int max) /* Terminate */ str[max-1] = '\0'; #ifdef JP - codeconv(str); + /* ʸ»ú¥³¡¼¥É¤¬°ìÅÙEUC¤Ç¤Ê¤¤¤È¤ï¤«¤ì¤Ð»Ä¤ê¤ÏÁ´¤ÆSJIS¤Î¤Ï¤º¡£ */ + codeconv(str, FALSE); #endif } diff --git a/src/scores.c b/src/scores.c index 047995101..afbe78145 100644 --- a/src/scores.c +++ b/src/scores.c @@ -308,7 +308,8 @@ if (mlev > clev) strcat(out_val, format(" ( } else { - codeconv(the_score.how); + /* ʸ»ú¥³¡¼¥É¤ÏÊѤï¤ë¤«¤â¤·¤ì¤Ê¤¤¡£ */ + codeconv(the_score.how, TRUE); /* Some people die outside of the dungeon */ if (!cdun) -- 2.11.0