呪文の巻物の効果がスナイパーにも一部付加されていた不具合を修正。

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

diff --git a/src/init1.c b/src/init1.c
index af4e9c4..bfcdb7d 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -841,7 +841,7 @@ static cptr d_info_flags1[] =
        "NO_VAULT",
        "ARENA",
        "DESTROY",
-       "XXX",
+       "GLASS_ROOM",
        "NO_CAVE",
        "NO_MAGIC",
        "NO_MELEE",
@@ -1034,7 +1034,7 @@ errr init_info_txt(FILE *fp, char *buf, header *head,
        /* Prepare the "fake" stuff */
        head->name_size = 0;
        head->text_size = 0;
-       head->tag_size = 1;
+       head->tag_size = 0;
 
        /* Parse */
        while (0 == my_fgets(fp, buf, 1024))
@@ -2718,8 +2718,8 @@ errr parse_r_info(char *buf, header *head)
 
                /* Save the values */
                r_ptr->speed = spd;
-               r_ptr->hdice = hp1;
-               r_ptr->hside = hp2;
+               r_ptr->hdice = MAX(hp1, 1);
+               r_ptr->hside = MAX(hp2, 1);
                r_ptr->aaf = aaf;
                r_ptr->ac = ac;
                r_ptr->sleep = slp;
@@ -4230,7 +4230,15 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
        else
        {
                /* Accept all printables except spaces and brackets */
+#ifdef JP
+               while (iskanji(*s) || (isprint(*s) && !my_strchr(" []", *s)))
+               {
+                       if (iskanji(*s)) s++;
+                       s++;
+               }
+#else
                while (isprint(*s) && !my_strchr(" []", *s)) ++s;
+#endif
 
                /* Extract final and Terminate */
                if ((f = *s) != '\0') *s++ = '\0';
@@ -4301,7 +4309,22 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
                        /* Player name */
                        else if (streq(b+1, "PLAYER"))
                        {
-                               v = player_base;
+                               static char tmp_player_name[32];
+                               char *pn, *tpn;
+                               for (pn = player_name, tpn = tmp_player_name; *pn; pn++, tpn++)
+                               {
+#ifdef JP
+                                       if (iskanji(*pn))
+                                       {
+                                               *(tpn++) = *(pn++);
+                                               *tpn = *pn;
+                                               continue;
+                                       }
+#endif
+                                       *tpn = my_strchr(" []", *pn) ? '_' : *pn;
+                               }
+                               *tpn = '\0';
+                               v = tmp_player_name;
                        }
 
                        /* Town */