From 6c2183d339814544c7e0779e78000e2602db9014 Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 24 Jan 2021 17:09:23 +0900 Subject: [PATCH] =?utf8?q?[Feature]=20#41179=20=E3=83=86=E3=82=AD=E3=82=B9?= =?utf8?q?=E3=83=88=E5=87=BA=E5=8A=9B=E4=B8=8A=E3=81=AE=E3=83=90=E3=83=BC?= =?utf8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E8=A1=A8=E8=A8=98=E3=81=AF=E5=85=A8?= =?utf8?q?=E3=81=A6put=5Fversion()=E3=81=AB=E7=B5=B1=E4=B8=80=E3=80=82=20/?= =?utf8?q?=20All=20version=20notations=20on=20the=20output=20are=20unified?= =?utf8?q?=20to=20put=5Fversion=20().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core/show-file.c | 11 ++++++++--- src/io-dump/character-dump.c | 5 +++-- src/io/report.c | 10 ++++------ src/wizard/monster-info-spoiler.c | 5 ++++- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/core/show-file.c b/src/core/show-file.c index b5dc10a07..ff4ab27ed 100644 --- 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 cd4d5a475..f47c3ad85 100644 --- 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 72595d0cb..91d646f87 100644 --- 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 3b48a1615..f9f3db0b1 100644 --- 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", "--------", "---", "---", "---", "--", "--", "---------------"); -- 2.11.0