[Fix] #2221 ペットに「^*」で始まる名前をつけるとあらゆるコマンドの入力時に確認を求められる事象を修正した

diff --git a/src/io/input-key-requester.cpp b/src/io/input-key-requester.cpp
index a856193..803dd9b 100644 (file)
--- a/src/io/input-key-requester.cpp
+++ b/src/io/input-key-requester.cpp
@@ -328,7 +328,7 @@ void InputKeyRequestor::sweep_confirmation_equipments()
     }
 }
 
-void InputKeyRequestor::confirm_command(std::optional<std::string_view> inscription, const int caret_command)
+void InputKeyRequestor::confirm_command(const std::optional<std::string> &inscription, const int caret_command)
 {
     if (!inscription.has_value()) {
         return;
@@ -336,11 +336,11 @@ void InputKeyRequestor::confirm_command(std::optional<std::string_view> inscript
 
     auto s = inscription->data();
     s = angband_strchr(s, '^');
-    while (s) {
+    while (s != nullptr) {
 #ifdef JP
-        auto sure = (s[1] == caret_command) || (s[1] == '*');
+        auto sure = s[1] == caret_command;
 #else
-        auto sure = (s[1] == command_cmd) || (s[1] == '*');
+        auto sure = s[1] == command_cmd;
         (void)caret_command;
 #endif
         if (sure) {

diff --git a/src/io/input-key-requester.h b/src/io/input-key-requester.h
index e405c90..edd96c1 100644 (file)
--- a/src/io/input-key-requester.h
+++ b/src/io/input-key-requester.h
@@ -4,7 +4,6 @@
 #include "system/angband.h"
 #include <optional>
 #include <string>
-#include <string_view>
 
 extern concptr keymap_act[KEYMAP_MODES][256];
 
@@ -49,7 +48,7 @@ private:
     void change_shopping_command();
     int get_caret_command();
     void sweep_confirmation_equipments();
-    void confirm_command(std::optional<std::string_view> inscription, const int caret_command);
+    void confirm_command(const std::optional<std::string> &inscription, const int caret_command);
 
     void make_commands_frame();
     std::string switch_special_menu_condition(const SpecialMenuContent &special_menu);