(2.2.0.11) バージョンコマンド(V)の表示修正 / Change 'V' command's message.

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

diff --git a/src/cmd4.c b/src/cmd4.c
index 70b407b..b70c9ac 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -502,13 +502,17 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                case NIKKI_MAXDEAPTH:
                {
                        fprintf(fff, _(" %2d:%02d %20s %sの最深階%d階に到達した。\n",
-                                                  " %2d:%02d %20s reached level %d of %s for the first time.\n"), hour, min, note_level, d_name+d_info[dungeon_type].name, num);
+                                                  " %2d:%02d %20s reached level %d of %s for the first time.\n"), hour, min, note_level,
+                                                  _(d_name+d_info[dungeon_type].name, num),
+                                                  _(num, d_name+d_info[dungeon_type].name));
                        break;
                }
                case NIKKI_TRUMP:
                {
                        fprintf(fff, _(" %2d:%02d %20s %s%sの最深階を%d階にセットした。\n",
-                                                  " %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, note_level, note, d_name + d_info[num].name, max_dlv[num]);
+                                                  " %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, note_level, note,
+                                                  _(d_name + d_info[num].name, max_dlv[num]),
+                                                  _(max_dlv[num], d_name + d_info[num].name));
                        break;
                }
                case NIKKI_STAIR:
@@ -565,12 +569,12 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                        if (num < 0)
                        {
                                int n = -num;
-                               fprintf(fff, _(" %2d:%02d %20s 闘技場の%d回戦で、%sの前に敗れ去った。\n", " %2d:%02d %20s beaten by %s in the %d%s fight.\n"),
-                                                       hour, min, note_level, _(n, note), _(note, n), _("", get_ordinal_number_suffix(n)));
+                               fprintf(fff, _(" %2d:%02d %20s 闘技場の%d%s回戦で、%sの前に敗れ去った。\n", " %2d:%02d %20s beaten by %s in the %d%s fight.\n"),
+                                                       hour, min, note_level, _(n, note), _("", n), _(note, get_ordinal_number_suffix(n)));
                                break;
                        }
-                       fprintf(fff, _(" %2d:%02d %20s 闘技場の%d回戦(%s)に勝利した。\n", " %2d:%02d %20s won the %d%s fight (%s).\n"), 
-                                               hour, min, note_level, num, _(note, get_ordinal_number_suffix(num)), note);
+                       fprintf(fff, _(" %2d:%02d %20s 闘技場の%d%s回戦(%s)に勝利した。\n", " %2d:%02d %20s won the %d%s fight (%s).\n"),
+                                               hour, min, note_level, num, _("", get_ordinal_number_suffix(num)), note);
                        
                        if (num == MAX_ARENA_MONS)
                        {
@@ -1854,14 +1858,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];
 
 
@@ -1915,9 +1915,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;
@@ -3957,8 +3956,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
 }
 
 
@@ -5743,7 +5748,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);