[Refactor] #3418 msg_format(string_view,...) のオーバーロードを削除した

diff --git a/src/mspell/mspell-util.cpp b/src/mspell/mspell-util.cpp
index 8a6c393..90c1370 100644 (file)
--- a/src/mspell/mspell-util.cpp
+++ b/src/mspell/mspell-util.cpp
@@ -76,18 +76,18 @@ bool monspell_message_base(PlayerType *player_ptr, MONSTER_IDX m_idx, MONSTER_ID
 
     if (msg_flag_aux) {
         if (mon_to_player) {
-            msg_format(msgs.to_player_true, m_name.data());
+            msg_format(msgs.to_player_true.data(), m_name.data());
             notice = true;
         } else if (mon_to_mon && known && see_either) {
-            msg_format(msgs.to_mons_true, m_name.data());
+            msg_format(msgs.to_mons_true.data(), m_name.data());
             notice = true;
         }
     } else {
         if (mon_to_player) {
-            msg_format(msgs.to_player_false, m_name.data());
+            msg_format(msgs.to_player_false.data(), m_name.data());
             notice = true;
         } else if (mon_to_mon && known && see_either) {
-            msg_format(msgs.to_mons_false, m_name.data(), t_name.data());
+            msg_format(msgs.to_mons_false.data(), m_name.data(), t_name.data());
             notice = true;
         }
     }

diff --git a/src/view/display-messages.cpp b/src/view/display-messages.cpp
index f32f953..b466c63 100644 (file)
--- a/src/view/display-messages.cpp
+++ b/src/view/display-messages.cpp
@@ -391,19 +391,6 @@ void msg_print(std::nullptr_t)
     }
 }
 
-/*
- * Display a formatted message, using "vstrnfmt()" and "msg_print()".
- */
-void msg_format(std::string_view fmt, ...)
-{
-    va_list vp;
-    char buf[1024];
-    va_start(vp, fmt);
-    (void)vstrnfmt(buf, sizeof(buf), fmt.data(), vp);
-    va_end(vp);
-    msg_print(buf);
-}
-
 void msg_format(const char *fmt, ...)
 {
     va_list vp;

diff --git a/src/view/display-messages.h b/src/view/display-messages.h
index 5263c25..61c4b5e 100644 (file)
--- a/src/view/display-messages.h
+++ b/src/view/display-messages.h
@@ -19,5 +19,4 @@ void message_add(std::string_view msg);
 void msg_erase(void);
 void msg_print(std::string_view msg);
 void msg_print(std::nullptr_t);
-void msg_format(std::string_view fmt, ...);
 void msg_format(const char *fmt, ...) __attribute__((format(printf, 1, 2)));