中立でないモンスターに乗馬して, 乗馬に向かない武器を装備していると,

[hengband/hengband.git] / src / japanese.c

diff --git a/src/japanese.c b/src/japanese.c
index 76b003f..e864d84 100644 (file)
--- a/src/japanese.c
+++ b/src/japanese.c
@@ -124,23 +124,6 @@ void jverb( const char *in , char *out , int flag){
   }
 }
 
-char* strstr_j(const char* s, const char* t)
-{
-       int i, l1, l2;
-
-       l1 = strlen(s);
-       l2 = strlen(t);
-       if (l1 >= l2) {
-               for(i = 0; i <= l1 - l2; i++) {
-                       if(!strncmp(s + i, t, l2))
-                               return (char *)s + i;
-                       if (iskanji(*(s + i)))
-                               i++;
-               }
-       }
-       return NULL;
-}
-
 
 /*
  * Convert SJIS string to EUC string
@@ -230,42 +213,94 @@ void euc2sjis(char *str)
 
 
 /*
- * str¤ò´Ä¶­¤Ë¹ç¤Ã¤¿Ê¸»ú¥³¡¼¥É¤ËÊÑ´¹¤¹¤ë¡£
+ * str¤ò´Ä¶­¤Ë¹ç¤Ã¤¿Ê¸»ú¥³¡¼¥É¤ËÊÑ´¹¤·¡¢ÊÑ´¹Á°¤Îʸ»ú¥³¡¼¥É¤òÊÖ¤¹¡£
  * str¤ÎŤµ¤ËÀ©¸Â¤Ï¤Ê¤¤¡£
+ *
+ * 0: Unknown
+ * 1: ASCII (Never known to be ASCII in this function.)
+ * 2: EUC
+ * 3: SJIS
  */
-bool codeconv(char *str)
+byte codeconv(char *str)
 {
+       byte code = 0;
        int i;
-       int kanji = 0, iseuc = 1;
 
-       /* ´Á»ú¤¬Â¸ºß¤·¡¢¤½¤Î´Á»ú¥³¡¼¥É¤¬EUC¤«¤É¤¦¤«Ä´¤Ù¤ë¡£*/
        for (i = 0; str[i]; i++)
        {
-               unsigned char c1 = str[i];
+               unsigned char c1;
+               unsigned char c2;
+
+               /* First byte */
+               c1 = str[i];
+
+               /* ASCII? */
+               if (!(c1 & 0x80)) continue;
+
+               /* Second byte */
+               i++;
+               c2 = str[i];
+
+               if (((0xa1 <= c1 && c1 <= 0xdf) || (0xfd <= c1 && c1 <= 0xfe)) &&
+                   (0xa1 <= c2 && c2 <= 0xfe))
+               {
+                       /* Only EUC is allowed */
+                       if (!code)
+                       {
+                               /* EUC */
+                               code = 2;
+                       }
+
+                       /* Broken string? */
+                       else if (code != 2)
+                       {
+                               /* No conversion */
+                               return 0;
+                       }
+               }
 
-               if (c1 & 0x80)  kanji = 1;
-               if ( c1>=0x80 && (c1 < 0xa1 || c1 > 0xfe)) iseuc = 0;
+               else if (((0x81 <= c1 && c1 <= 0x9f) &&
+                         ((0x40 <= c2 && c2 <= 0x7e) || (0x80 <= c2 && c2 <= 0xfc))) ||
+                        ((0xe0 <= c1 && c1 <= 0xfc) &&
+                         (0x40 <= c2 && c2 <= 0x7e)))
+               {
+                       /* Only SJIS is allowed */
+                       if (!code)
+                       {
+                               /* SJIS */
+                               code = 3;
+                       }
+
+                       /* Broken string? */
+                       else if (code != 3)
+                       {
+                               /* No conversion */
+                               return 0;
+                       }
+               }
        }
 
-#ifdef EUC
-       if (kanji && !iseuc)     /* SJIS -> EUC */
+
+       switch (code)
        {
+#ifdef EUC
+       case 3:
+               /* SJIS -> EUC */
                sjis2euc(str);
-
-               return TRUE;
-       }
+               break;
 #endif
 
 #ifdef SJIS
-       if (kanji && iseuc)     /* EUC -> SJIS */
-       {
+       case 2:
+               /* EUC -> SJIS */
                euc2sjis(str);
 
-               return TRUE;
-       }
+               break;
 #endif
+       }
 
-       return FALSE;
+       /* Return kanji code */
+       return code;
 }
 
 /* ʸ»úÎós¤Îx¥Ð¥¤¥ÈÌܤ¬´Á»ú¤Î1¥Ð¥¤¥ÈÌܤ«¤É¤¦¤«È½Äꤹ¤ë */