空腹充足の巻物の記述を削除.

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

diff --git a/src/cmd4.c b/src/cmd4.c
index c4b39b9..57063e9 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;
@@ -749,62 +751,111 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                        fprintf(fff, " %2d:%02d %20s ", hour, min, note_level);
                        switch (num)
                        {
-                               case 0:
+                               case RECORD_NAMED_PET_NAME:
 #ifdef JP
                                        fprintf(fff, "%s¤òι¤Îͧ¤Ë¤¹¤ë¤³¤È¤Ë·è¤á¤¿¡£\n", note);
 #else
                                        fprintf(fff, "decided to travel together with %s.\n", note);
 #endif
                                        break;
-                               case 1:
+                               case RECORD_NAMED_PET_UNNAME:
 #ifdef JP
                                        fprintf(fff, "%s¤Î̾Á°¤ò¾Ã¤·¤¿¡£\n", note);
 #else
                                        fprintf(fff, "unnamed %s.\n", note);
 #endif
                                        break;
-                               case 2:
+                               case RECORD_NAMED_PET_DISMISS:
 #ifdef JP
                                        fprintf(fff, "%s¤ò²òÊü¤·¤¿¡£\n", note);
 #else
                                        fprintf(fff, "dismissed %s.\n", note);
 #endif
                                        break;
-                               case 3:
+                               case RECORD_NAMED_PET_DEATH:
 #ifdef JP
                                        fprintf(fff, "%s¤¬»à¤ó¤Ç¤·¤Þ¤Ã¤¿¡£\n", note);
 #else
                                        fprintf(fff, "%s died.\n", note);
 #endif
                                        break;
-                               case 4:
+                               case RECORD_NAMED_PET_MOVED:
 #ifdef JP
                                        fprintf(fff, "%s¤ò¤ª¤¤¤ÆÊ̤ΥޥåפذÜÆ°¤·¤¿¡£\n", note);
 #else
                                        fprintf(fff, "moved to another map leaving %s behind.\n", note);
 #endif
                                        break;
-                               case 5:
+                               case RECORD_NAMED_PET_LOST_SIGHT:
 #ifdef JP
                                        fprintf(fff, "%s¤È¤Ï¤°¤ì¤Æ¤·¤Þ¤Ã¤¿¡£\n", note);
 #else
                                        fprintf(fff, "lost sight of %s.\n", note);
 #endif
                                        break;
-                               case 6:
+                               case RECORD_NAMED_PET_DESTROY:
 #ifdef JP
                                        fprintf(fff, "%s¤¬*Ç˲õ*¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
 #else
                                        fprintf(fff, "%s was made disappeared by *destruction*.\n", note);
 #endif
                                        break;
-                               case 7:
+                               case RECORD_NAMED_PET_EARTHQUAKE:
 #ifdef JP
                                        fprintf(fff, "%s¤¬´äÀФ˲¡¤·ÄÙ¤µ¤ì¤¿¡£\n", note);
 #else
                                        fprintf(fff, "%s was crushed by falling rocks.\n", note);
 #endif
                                        break;
+                               case RECORD_NAMED_PET_GENOCIDE:
+#ifdef JP
+                                       fprintf(fff, "%s¤¬Ëõ»¦¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s was made disappeared by genocide.\n", note);
+#endif
+                                       break;
+                               case RECORD_NAMED_PET_WIZ_ZAP:
+#ifdef JP
+                                       fprintf(fff, "%s¤¬¥Ç¥Ð¥Ã¥°¥³¥Þ¥ó¥É¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s was removed by debug command.\n", note);
+#endif
+                                       break;
+                               case RECORD_NAMED_PET_TELE_LEVEL:
+#ifdef JP
+                                       fprintf(fff, "%s¤¬¥Æ¥ì¥Ý¡¼¥È¡¦¥ì¥Ù¥ë¤Ë¤è¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s was made disappeared by teleport level.\n", note);
+#endif
+                                       break;
+                               case RECORD_NAMED_PET_BLAST:
+#ifdef JP
+                                       fprintf(fff, "%s¤òÇúÇˤ·¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "blasted %s.\n", note);
+#endif
+                                       break;
+                               case RECORD_NAMED_PET_HEAL_LEPER:
+#ifdef JP
+                                       fprintf(fff, "%s¤Îɵ¤¤¬¼£¤ê餫¤é³°¤ì¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s was healed and left.\n", note);
+#endif
+                                       break;
+                               case RECORD_NAMED_PET_COMPACT:
+#ifdef JP
+                                       fprintf(fff, "%s¤¬¥â¥ó¥¹¥¿¡¼¾ðÊ󰵽̤ˤè¤Ã¤Æ¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s was made disappeared by compacting monsters.\n", note);
+#endif
+                                       break;
+                               case RECORD_NAMED_PET_LOSE_PARENT:
+#ifdef JP
+                                       fprintf(fff, "%s¤Î¾¤´­¼Ô¤¬´û¤Ë¤¤¤Ê¤¤¤¿¤á¾Ã¤¨µî¤Ã¤¿¡£\n", note);
+#else
+                                       fprintf(fff, "%s disappeared because there does not exist summoner.\n", note);
+#endif
+                                       break;
                                default:
                                        fprintf(fff, "\n");
                                        break;
@@ -3008,7 +3059,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
@@ -3775,7 +3826,7 @@ void do_cmd_visuals(void)
 #endif
 
                        /* Dump monsters */
-                       for (i = 1; i < max_r_idx; i++)
+                       for (i = 0; i < max_r_idx; i++)
                        {
                                monster_race *r_ptr = &r_info[i];
 
@@ -3842,7 +3893,7 @@ void do_cmd_visuals(void)
 #endif
 
                        /* Dump objects */
-                       for (i = 1; i < max_k_idx; i++)
+                       for (i = 0; i < max_k_idx; i++)
                        {
                                char o_name[80];
                                object_kind *k_ptr = &k_info[i];
@@ -3926,7 +3977,7 @@ void do_cmd_visuals(void)
 #endif
 
                        /* Dump features */
-                       for (i = 1; i < max_f_idx; i++)
+                       for (i = 0; i < max_f_idx; i++)
                        {
                                feature_type *f_ptr = &f_info[i];
 
@@ -5302,6 +5353,7 @@ static cptr object_group_text[] =
        "¥´¥ß",
        "¶õ¤Î¥Ó¥ó",
        "¹ü",
+       "»àÂÎ",
        "Åá·õÎà",       /* "Swords" */
        "Æß´ï",         /* "Blunt Weapons" */
        "ĹÊÁÉð´ï",     /* "Polearms" */
@@ -5320,6 +5372,7 @@ static cptr object_group_text[] =
        "´§",   /* "Crowns" */
        "¥Ö¡¼¥Ä",       /* "Boots" */
        "ËâË¡½ñ",
+       "ºâÊõ",
        "²¿¤«",
 #else
        "Mushrooms",
@@ -5343,6 +5396,7 @@ static cptr object_group_text[] =
        "Junks",
        "Bottles",
        "Skeletons",
+       "Corpses",
        "Swords",
        "Blunt Weapons",
        "Polearms",
@@ -5361,6 +5415,7 @@ static cptr object_group_text[] =
        "Crowns",
        "Boots",
        "Spellbooks",
+       "Treasure",
        "Something",
 #endif
        NULL
@@ -5393,6 +5448,7 @@ static byte object_group_tval[] =
        TV_JUNK,
        TV_BOTTLE,
        TV_SKELETON,
+       TV_CORPSE,
        TV_SWORD,
        TV_HAFTED,
        TV_POLEARM,
@@ -5411,6 +5467,7 @@ static byte object_group_tval[] =
        TV_CROWN,
        TV_BOOTS,
        TV_LIFE_BOOK, /* Hack -- all spellbooks */
+       TV_GOLD,
        0,
        0,
 };
@@ -8102,7 +8159,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("ÆäËÊѤï¤Ã¤¿¤È¤³¤í¤Ï¤Ê¤¤¤è¤¦¤À¡£");
@@ -9964,6 +10021,7 @@ void do_cmd_time(void)
        char desc[1024];
 
        char buf[1024];
+       char day_buf[10];
 
        FILE *fff;
 
@@ -9983,14 +10041,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