[modify]スクリーンダンプの最大サイズを増加

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

diff --git a/src/cmd4.c b/src/cmd4.c
index 50fed9a..6e3d82a 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -464,6 +464,11 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                        fprintf(fff, _(" %2d:%02d %20s %sを発見した。\n", " %2d:%02d %20s discovered %s.\n"), hour, min, note_level, note);
                        break;
                }
+               case NIKKI_ART_SCROLL:
+               {
+                       fprintf(fff, _(" %2d:%02d %20s 巻物によって%sを生成した。\n", " %2d:%02d %20s created %s by scroll.\n"), hour, min, note_level, note);
+                       break;
+               }
                case NIKKI_UNIQUE:
                {
                        fprintf(fff, _(" %2d:%02d %20s %sを倒した。\n", " %2d:%02d %20s defeated %s.\n"), hour, min, note_level, note);
@@ -680,12 +685,19 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                                case RECORD_NAMED_PET_LOSE_PARENT:
                                        fprintf(fff, _("%sの召喚者が既にいないため消え去った。\n", "%s disappeared because there does not exist summoner.\n"), note);
                                        break;
+
+
                                default:
                                        fprintf(fff, "\n");
                                        break;
                        }
                        break;
                }
+
+               case NIKKI_WIZARD_LOG:
+                       fprintf(fff, "%s\n", note);
+                       break;
+
                default:
                        break;
        }
@@ -1225,14 +1237,9 @@ void do_cmd_messages(int num_now)
                }
 
                /* Display header XXX XXX XXX */
-#ifdef JP
                /* translation */
-               prt(format("以前のメッセージ %d-%d 全部で(%d)",
-                          i, i + j - 1, n), 0, 0);
-#else
-               prt(format("Message Recall (%d-%d of %d)",
+               prt(format(_("以前のメッセージ %d-%d 全部で(%d)", "Message Recall (%d-%d of %d)"),
                           i, i + j - 1, n), 0, 0);
-#endif
 
                /* Display prompt (not very informative) */
                prt(_("[ 'p' で更に古いもの, 'n' で更に新しいもの, '/' で検索, ESC で中断 ]",
@@ -1380,7 +1387,7 @@ void do_cmd_messages(int num_now)
 /*!
  * チートオプションの最大数 / Number of cheating options
  */
-#define CHEAT_MAX 7
+#define CHEAT_MAX 9
 
 /*!
  * チーとオプションの定義テーブル / Cheating options
@@ -1413,7 +1420,17 @@ static option_type cheat_info[CHEAT_MAX] =
 
        { &cheat_save,          FALSE,  255,    0x40, 0x00,
                "cheat_save",           _("死んだ時セーブするか確認する", "Ask for saving death")
+       },
+
+       { &cheat_diary_output,  FALSE,  255,    0x80, 0x00,
+               "cheat_diary_output",   _("ウィザードログを日記に出力する", "Output wizard log to diary.")
+       },
+
+       { &cheat_turn,  FALSE,  255,    0x81, 0x00,
+               "cheat_turn",   _("ゲームメッセージにターン表示を行う", "Put turn to game message.")
        }
+
+
 };
 
 /*!
@@ -1858,14 +1875,10 @@ void do_cmd_options_aux(int page, cptr info)
 static void do_cmd_options_win(void)
 {
        int i, j, d;
-
        int y = 0;
        int x = 0;
-
        char ch;
-
        bool go = TRUE;
-
        u32b old_flag[8];
 
 
@@ -1919,9 +1932,8 @@ static void do_cmd_options_win(void)
                        /* Display the windows */
                        for (j = 0; j < 8; j++)
                        {
-                               byte a = TERM_WHITE;
-
                                char c = '.';
+                               a = TERM_WHITE;
 
                                /* Use color */
                                if ((i == y) && (j == x)) a = TERM_L_BLUE;
@@ -3961,8 +3973,14 @@ void do_cmd_note(void)
 void do_cmd_version(void)
 {
        /* Silly message */
+
+#if FAKE_VER_EXTRA > 0
+       msg_format(_("変愚蛮怒(Hengband) %d.%d.%d.%d", "You are playing Hengband %d.%d.%d.%d."),
+               FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH, FAKE_VER_EXTRA);
+#else
        msg_format(_("変愚蛮怒(Hengband) %d.%d.%d", "You are playing Hengband %d.%d.%d."),
-                               FAKE_VER_MAJOR-10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+               FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+#endif
 }
 
 
@@ -5747,7 +5765,7 @@ static void do_cmd_knowledge_weapon_exp(void)
 
                                if ((k_ptr->tval == TV_SWORD - i) && (k_ptr->sval == num))
                                {
-                                       if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON)) continue;
+                                       if ((k_ptr->tval == TV_BOW) && (k_ptr->sval == SV_CRIMSON || k_ptr->sval == SV_HARP)) continue;
 
                                        weapon_exp = p_ptr->weapon_exp[4 - i][num];
                                        strip_name(tmp, j);
@@ -8301,7 +8319,9 @@ bool ang_sort_comp_quest_num(vptr u, vptr v, int a, int b)
        /* Unused */
        (void)v;
 
-       return (qa->comptime <= qb->comptime);
+       return (qa->comptime != qb->comptime) ?
+               (qa->comptime < qb->comptime) :
+               (qa->level <= qb->level);
 }
 
 void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b)