幻覚に関するバグ修正.

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

diff --git a/src/cmd4.c b/src/cmd4.c
index c66f731..9c3edfe 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -461,9 +461,11 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                case NIKKI_HIGAWARI:
                {
 #ifdef JP
-                       fprintf(fff, "%dÆüÌÜ\n",day);
+                       if (day < MAX_DAYS) fprintf(fff, "%dÆüÌÜ\n", day);
+                       else fputs("*****ÆüÌÜ\n", fff);
 #else
-                       fprintf(fff, "Day %d\n",day);
+                       if (day < MAX_DAYS) fprintf(fff, "Day %d\n", day);
+                       else fputs("Day *****\n", fff);
 #endif
                        do_level = FALSE;
                        break;
@@ -805,6 +807,13 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                                        fprintf(fff, "%s was crushed by falling rocks.\n", note);
 #endif
                                        break;
+                               case 8:
+#ifdef JP
+                                       fprintf(fff, "%s¤¬¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s was made disappeared by teleport level.\n", note);
+#endif
+                                       break;
                                default:
                                        fprintf(fff, "\n");
                                        break;
@@ -930,9 +939,9 @@ static void do_cmd_bunshou(void)
        char bunshou[80] = "\0";
 
 #ifdef JP
-       if (get_string("ÆâÍÆ: ", tmp, 79, FALSE))
+       if (get_string("ÆâÍÆ: ", tmp, 79))
 #else
-       if (get_string("diary note: ", tmp, 79, FALSE))
+       if (get_string("diary note: ", tmp, 79))
 #endif
        {
                strcpy(bunshou, tmp);
@@ -1225,9 +1234,9 @@ void do_cmd_change_name(void)
                {
                        sprintf(tmp, "%s.txt", player_base);
 #ifdef JP
-                       if (get_string("¥Õ¥¡¥¤¥ë̾: ", tmp, 80, FALSE))
+                       if (get_string("¥Õ¥¡¥¤¥ë̾: ", tmp, 80))
 #else
-                       if (get_string("File name: ", tmp, 80, FALSE))
+                       if (get_string("File name: ", tmp, 80))
 #endif
 
                        {
@@ -1382,7 +1391,7 @@ void do_cmd_messages(int num_now)
 
 
                /* Get a command */
-               skey = inkey_special(TRUE, FALSE);
+               skey = inkey_special(TRUE);
 
                /* Exit on Escape */
                if (skey == ESCAPE) break;
@@ -2712,9 +2721,9 @@ void do_cmd_pref(void)
 
        /* Ask for a "user pref command" */
 #ifdef JP
-       if (!get_string("ÀßÄêÊѹ¹¥³¥Þ¥ó¥É: ", buf, 80, FALSE)) return;
+       if (!get_string("ÀßÄêÊѹ¹¥³¥Þ¥ó¥É: ", buf, 80)) return;
 #else
-       if (!get_string("Pref: ", buf, 80, FALSE)) return;
+       if (!get_string("Pref: ", buf, 80)) return;
 #endif
 
 
@@ -3008,7 +3017,7 @@ void do_cmd_macros(void)
 
                /* Describe that action */
 #ifdef JP
-               prt("(1) ¥æ¡¼¥¶¡¼ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥í¡¼¥É", 4, 5);
+               prt("¥Þ¥¯¥í¹ÔÆ°¤¬(¤â¤·¤¢¤ì¤Ð)²¼¤Ëɽ¼¨¤µ¤ì¤Þ¤¹:", 20, 0);
 #else
                prt("Current action (if any) shown below:", 20, 0);
 #endif
@@ -3597,7 +3606,7 @@ static bool cmd_visuals_aux(int i, int *num, int max)
 
                sprintf(str, "%d", *num);
 
-               if (!get_string(format("Input new number(0-%d): ", max-1), str, 4, TRUE))
+               if (!get_string(format("Input new number(0-%d): ", max-1), str, 4))
                        return FALSE;
 
                tmp = strtol(str, NULL, 0);
@@ -4703,9 +4712,9 @@ void do_cmd_note(void)
 
        /* Input */
 #ifdef JP
-       if (!get_string("¥á¥â: ", buf, 60, FALSE)) return;
+       if (!get_string("¥á¥â: ", buf, 60)) return;
 #else
-       if (!get_string("Note: ", buf, 60, FALSE)) return;
+       if (!get_string("Note: ", buf, 60)) return;
 #endif
 
 
@@ -5302,6 +5311,7 @@ static cptr object_group_text[] =
        "¥´¥ß",
        "¶õ¤Î¥Ó¥ó",
        "¹ü",
+       "»àÂÎ",
        "Åá·õÎà",       /* "Swords" */
        "Æß´ï",         /* "Blunt Weapons" */
        "ĹÊÁÉð´ï",     /* "Polearms" */
@@ -5320,6 +5330,7 @@ static cptr object_group_text[] =
        "´§",   /* "Crowns" */
        "¥Ö¡¼¥Ä",       /* "Boots" */
        "ËâË¡½ñ",
+       "ºâÊõ",
        "²¿¤«",
 #else
        "Mushrooms",
@@ -5343,6 +5354,7 @@ static cptr object_group_text[] =
        "Junks",
        "Bottles",
        "Skeletons",
+       "Corpses",
        "Swords",
        "Blunt Weapons",
        "Polearms",
@@ -5361,6 +5373,7 @@ static cptr object_group_text[] =
        "Crowns",
        "Boots",
        "Spellbooks",
+       "Treasure",
        "Something",
 #endif
        NULL
@@ -5393,6 +5406,7 @@ static byte object_group_tval[] =
        TV_JUNK,
        TV_BOTTLE,
        TV_SKELETON,
+       TV_CORPSE,
        TV_SWORD,
        TV_HAFTED,
        TV_POLEARM,
@@ -5411,6 +5425,7 @@ static byte object_group_tval[] =
        TV_CROWN,
        TV_BOOTS,
        TV_LIFE_BOOK, /* Hack -- all spellbooks */
+       TV_GOLD,
        0,
        0,
 };
@@ -6097,9 +6112,9 @@ static void do_cmd_save_screen_html(void)
        char buf[1024], tmp[256] = "screen.html";
 
 #ifdef JP
-       if (!get_string("¥Õ¥¡¥¤¥ë̾: ", tmp, 80, FALSE))
+       if (!get_string("¥Õ¥¡¥¤¥ë̾: ", tmp, 80))
 #else
-       if (!get_string("File name: ", tmp, 80, FALSE))
+       if (!get_string("File name: ", tmp, 80))
 #endif
                return;
 
@@ -6672,15 +6687,22 @@ static void do_cmd_knowledge_uniques(void)
 
        if (n_alive_total)
        {
-               fprintf(fff, "---------  -----------\n", n_alive_total);
 #ifdef JP
-               fprintf(fff, "     ¹ç·×  À¸Â¸: %3dÂÎ\n", n_alive_total);
+               fputs("---------  -----------\n", fff);
+               fprintf(fff, "     ¹ç·×  À¸Â¸: %3dÂÎ\n\n", n_alive_total);
 #else
-               fprintf(fff, "        Total  alive: %3d\n", n_alive_total);
+               fputs("-------------  ----------\n", fff);
+               fprintf(fff, "        Total  alive: %3d\n\n", n_alive_total);
+#endif
+       }
+       else
+       {
+#ifdef JP
+               fputs("¸½ºß¤Ï´ûÃΤÎÀ¸Â¸¥æ¥Ë¡¼¥¯¤Ï¤¤¤Þ¤»¤ó¡£\n", fff);
+#else
+               fputs("No known uniques alive.\n", fff);
 #endif
-               fputc('\n', fff);
        }
-       else fputs("¸½ºß¤Ï´ûÃΤÎÀ¸Â¸¥æ¥Ë¡¼¥¯¤Ï¤¤¤Þ¤»¤ó¡£\n", fff);
 
        /* Scan the monster races */
        for (k = 0; k < n; k++)
@@ -7605,7 +7627,7 @@ static bool visual_mode_command(char ch, bool *visual_list_ptr,
 
        case 'P':
        case 'p':
-               if (attr_idx || (!(char_idx & 0x80) && char_idx)) /* Allow ATTR_DARK text */
+               if (attr_idx || (!(char_idx & 0x80) && char_idx)) /* Allow TERM_DARK text */
                {
                        /* Set the char */
                        *cur_attr_ptr = attr_idx;
@@ -7830,8 +7852,8 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, int d
                        if (direct_r_idx < 0) prt("Group", 4, 0);
                        prt("Name", 4, max + 3);
                        if (p_ptr->wizard || visual_only) prt("Idx", 4, 62);
-                       prt("Sym  ", 4, 67);
-                       if (!visual_only) prt(" Kills", 4, 72);
+                       prt("Sym", 4, 68);
+                       if (!visual_only) prt("Kills", 4, 73);
 #endif
 
                        for (i = 0; i < 78; i++)
@@ -8095,7 +8117,7 @@ static void desc_obj_fake(int k_idx)
        /* Hack -- Handle stuff */
        handle_stuff();
 
-       if (!screen_object(o_ptr, FALSE))
+       if (!screen_object(o_ptr, SCROBJ_FAKE_OBJECT | SCROBJ_FORCE_DETAIL))
        {
 #ifdef JP
                msg_print("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£");
@@ -8778,7 +8800,7 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, int d
                        case 'p':
                                if (!visual_list)
                                {
-                                       /* Allow ATTR_DARK text */
+                                       /* Allow TERM_DARK text */
                                        for (i = F_LIT_NS_BEGIN; i < F_LIT_MAX; i++)
                                        {
                                                if (attr_idx_feat[i] || (!(char_idx_feat[i] & 0x80) && char_idx_feat[i])) f_ptr->x_attr[i] = attr_idx_feat[i];
@@ -9957,6 +9979,7 @@ void do_cmd_time(void)
        char desc[1024];
 
        char buf[1024];
+       char day_buf[10];
 
        FILE *fff;
 
@@ -9976,14 +9999,17 @@ void do_cmd_time(void)
 #endif
 
 
+       if (day < MAX_DAYS) sprintf(day_buf, "%d", day);
+       else strcpy(day_buf, "*****");
+
        /* Message */
 #ifdef JP
-       msg_format("%d ÆüÌÜ,»þ¹ï¤Ï%d:%02d %s¤Ç¤¹¡£",
-                  day, (hour % 12 == 0) ? 12 : (hour % 12),
+       msg_format("%sÆüÌÜ, »þ¹ï¤Ï%d:%02d %s¤Ç¤¹¡£",
+                  day_buf, (hour % 12 == 0) ? 12 : (hour % 12),
                   min, (hour < 12) ? "AM" : "PM");
 #else
-       msg_format("This is day %d. The time is %d:%02d %s.",
-                  day, (hour % 12 == 0) ? 12 : (hour % 12),
+       msg_format("This is day %s. The time is %d:%02d %s.",
+                  day_buf, (hour % 12 == 0) ? 12 : (hour % 12),
                   min, (hour < 12) ? "AM" : "PM");
 #endif