Merge branch 'develop' into macos-develop

[hengbandforosx/hengbandosx.git] / src / cmd-io / cmd-process-screen.cpp

diff --git a/src/cmd-io/cmd-process-screen.cpp b/src/cmd-io/cmd-process-screen.cpp
index e9764d7..fcb8f46 100644 (file)
--- a/src/cmd-io/cmd-process-screen.cpp
+++ b/src/cmd-io/cmd-process-screen.cpp
@@ -1,4 +1,4 @@
-/*!
+/*!
  * @brief 記念撮影のセーブとロード
  * @date 2020/04/22
  * @Author Hourier
@@ -203,8 +203,7 @@ static void write_html_footer(FILE *tmpfff, FILE *fff)
 
 void exe_cmd_save_screen_html(const std::filesystem::path &path, bool need_message)
 {
-    TERM_LEN wid, hgt;
-    term_get_size(&wid, &hgt);
+    const auto &[wid, hgt] = term_get_size();
     auto *fff = angband_fopen(path, FileOpenMode::WRITE, false, FileOpenType::HTML);
     if (!check_screen_html_can_open(fff, path, need_message)) {
         return;
@@ -235,12 +234,12 @@ void exe_cmd_save_screen_html(const std::filesystem::path &path, bool need_messa
  */
 static void exe_cmd_save_screen_html_with_naming()
 {
-    char tmp[256] = "screen.html";
-    if (!get_string(_("ファイル名: ", "File name: "), tmp, 80)) {
+    const auto filename = input_string(_("ファイル名: ", "File name: "), 80, "screen.html");
+    if (!filename) {
         return;
     }
 
-    auto path = path_build(ANGBAND_DIR_USER, tmp);
+    auto path = path_build(ANGBAND_DIR_USER, *filename);
     msg_print(nullptr);
     exe_cmd_save_screen_html(path, true);
 }
@@ -376,10 +375,8 @@ void do_cmd_save_screen(PlayerType *player_ptr)
         return;
     }
 
-    int wid, hgt;
-    term_get_size(&wid, &hgt);
-
-    bool old_use_graphics = update_use_graphics(player_ptr);
+    const auto &[wid, hgt] = term_get_size();
+    const auto old_use_graphics = update_use_graphics(player_ptr);
 
     if (html_dump) {
         exe_cmd_save_screen_html_with_naming();
@@ -490,8 +487,7 @@ static void draw_colored_characters(FILE *fff, int wid, int hgt, bool okay)
  */
 void do_cmd_load_screen(void)
 {
-    TERM_LEN wid, hgt;
-    term_get_size(&wid, &hgt);
+    const auto &[wid, hgt] = term_get_size();
     const auto path = path_build(ANGBAND_DIR_USER, "dump.txt");
     auto *fff = angband_fopen(path, FileOpenMode::READ);
     if (!fff) {