From d844aa06fef99eb6df74322797daf23b6214b3d4 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sat, 24 Jun 2023 07:41:26 -0600 Subject: [PATCH] macOS: fix mistakes in merge --- src/cmd-io/cmd-process-screen.cpp | 5 ++--- src/core/asking-player.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/cmd-io/cmd-process-screen.cpp b/src/cmd-io/cmd-process-screen.cpp index d324d1d2f..e9764d712 100644 --- a/src/cmd-io/cmd-process-screen.cpp +++ b/src/cmd-io/cmd-process-screen.cpp @@ -205,9 +205,8 @@ void exe_cmd_save_screen_html(const std::filesystem::path &path, bool need_messa { TERM_LEN wid, hgt; term_get_size(&wid, &hgt); - auto *fff = angband_fopen(filename, FileOpenMode::WRITE, false, - FileOpenType::HTML); - if (!check_screen_html_can_open(fff, filename, need_message)) { + auto *fff = angband_fopen(path, FileOpenMode::WRITE, false, FileOpenType::HTML); + if (!check_screen_html_can_open(fff, path, need_message)) { return; } diff --git a/src/core/asking-player.cpp b/src/core/asking-player.cpp index f47c94e18..ef86af855 100644 --- a/src/core/asking-player.cpp +++ b/src/core/asking-player.cpp @@ -443,8 +443,8 @@ std::optional input_value_int(std::string_view prompt, int min, int max, in { std::stringstream ss; char tmp_val[12] = ""; - std::to_chars(std::begin(tmp_val), std::end(tmp_val) - 1, *value); - st << prompt << "(" << min << "-" << max << "): "; + std::to_chars(std::begin(tmp_val), std::end(tmp_val) - 1, initial_value); + ss << prompt << "(" << min << "-" << max << "): "; auto digit = std::max(std::to_string(min).length(), std::to_string(max).length()); while (true) { if (!get_string(ss.str().data(), tmp_val, digit)) { -- 2.11.0