[Feature] #41179 テキスト出力上のバージョン表記は全てput_version()に統一。 /

All version notations on the output are unified to put_version ().

diff --git a/src/core/show-file.c b/src/core/show-file.c
index b5dc10a..ff4ab27 100644 (file)
--- a/src/core/show-file.c
+++ b/src/core/show-file.c
@@ -307,11 +307,16 @@ bool show_file(player_type *creature_ptr, bool show_version, concptr name, concp
                        continue;
                }
 
+                                       prt(format(_("[変愚蛮怒 %d.%d.%d, %s, %d/%d]", "[Hengband %d.%d.%d, %s, Line %d/%d]"), FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH,
+                        caption, line, size),
+                    0, 0);
+
+
                if (show_version)
                {
-                       prt(format(_("[変愚蛮怒 %d.%d.%d, %s, %d/%d]", "[Hengband %d.%d.%d, %s, Line %d/%d]"),
-                               FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH,
-                               caption, line, size), 0, 0);
+                       char title[127];
+                       put_version(title);
+                        prt(format("[%s]", title), 0, 0);
                }
                else
                {

diff --git a/src/io-dump/character-dump.c b/src/io-dump/character-dump.c
index cd4d5a4..f47c3ad 100644 (file)
--- a/src/io-dump/character-dump.c
+++ b/src/io-dump/character-dump.c
@@ -561,8 +561,9 @@ static concptr get_check_sum(void)
  */
 void make_character_dump(player_type *creature_ptr, FILE *fff, void (*update_playtime)(void), display_player_pf display_player)
 {
-    fprintf(
-        fff, _("  [変愚蛮怒 %d.%d.%d キャラクタ情報]\n\n", "  [Hengband %d.%d.%d Character Dump]\n\n"), FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+    char title[127];
+    put_version(title);
+    fprintf(fff, _("  [%s キャラクタ情報]\n\n", "  [%s Character Dump]\n\n"), title);
     (*update_playtime)();
 
     dump_aux_player_status(creature_ptr, fff, display_player);

diff --git a/src/io/report.c b/src/io/report.c
index 72595d0..91d646f 100644 (file)
--- a/src/io/report.c
+++ b/src/io/report.c
@@ -172,7 +172,7 @@ static bool http_post(int sd, concptr url, BUF *buf)
 
     output = buf_new();
     buf_sprintf(output, "POST %s HTTP/1.0\r\n", url);
-    buf_sprintf(output, "User-Agent: Hengband %d.%d.%d\r\n", FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+    buf_sprintf(output, "User-Agent: Hengband %d.%d.%d.%d\r\n", FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH, FAKE_VER_EXTRA);
 
     buf_sprintf(output, "Content-Length: %d\r\n", buf->size);
     buf_sprintf(output, "Content-Encoding: binary\r\n");
@@ -382,6 +382,8 @@ errr report_score(player_type *creature_ptr, void (*update_playtime)(void), disp
     score = buf_new();
 
     char seikakutmp[128];
+    char title[128];
+    put_version(title);
 #ifdef JP
     sprintf(seikakutmp, "%s%s", ap_ptr->title, (ap_ptr->no ? "の" : ""));
 #else
@@ -389,11 +391,7 @@ errr report_score(player_type *creature_ptr, void (*update_playtime)(void), disp
 #endif
 
     buf_sprintf(score, "name: %s\n", creature_ptr->name);
-#ifdef JP
-    buf_sprintf(score, "version: 変愚蛮怒 %d.%d.%d\n", FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH);
-#else
-    buf_sprintf(score, "version: Hengband %d.%d.%d\n", FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH);
-#endif
+    buf_sprintf(score, "version: %s\n", title);
     buf_sprintf(score, "score: %d\n", calc_score(creature_ptr));
     buf_sprintf(score, "level: %d\n", creature_ptr->lev);
     buf_sprintf(score, "depth: %d\n", creature_ptr->current_floor_ptr->dun_level);

diff --git a/src/wizard/monster-info-spoiler.c b/src/wizard/monster-info-spoiler.c
index 3b48a16..f9f3db0 100644 (file)
--- a/src/wizard/monster-info-spoiler.c
+++ b/src/wizard/monster-info-spoiler.c
@@ -91,8 +91,11 @@ void spoil_mon_desc(player_type *player_ptr, concptr fname)
         return;
     }
 
+    char title[200];
+    put_version(title);
+
     C_MAKE(who, max_r_idx, MONRACE_IDX);
-    fprintf(spoiler_file, "Monster Spoilers for Hengband Version %d.%d.%d\n", FAKE_VER_MAJOR - 10, FAKE_VER_MINOR, FAKE_VER_PATCH);
+    fprintf(spoiler_file, "Monster Spoilers for %s\n", title);
     fprintf(spoiler_file, "------------------------------------------\n\n");
     fprintf(spoiler_file, "    %-38.38s%4s%4s%4s%7s%5s  %15.15s\n", "Name", "Lev", "Rar", "Spd", "Hp", "Ac", "  Visual Info  ");
     fprintf(spoiler_file, "%-42.42s%4s%4s%4s%7s%5s  %15.15s\n", "--------", "---", "---", "---", "--", "--", "---------------");