[Refactor] #3381 self_info_type にコンストラクタを定義し、初期値を追加した。もって未初期化警告に対応した

diff --git a/src/player-info/self-info-util.cpp b/src/player-info/self-info-util.cpp
index dca3506..b9a77f3 100644 (file)
--- a/src/player-info/self-info-util.cpp
+++ b/src/player-info/self-info-util.cpp
@@ -1,9 +1,7 @@
-#include "player-info/self-info-util.h"
+/*!
+ * @brief 自己分析における各種情報格納処理 (予定地)
+ * @author Hourier
+ * @date 2023/06/10
+ */
 
-self_info_type *initialize_self_info_type(self_info_type *self_ptr)
-{
-    self_ptr->line = 0;
-    self_ptr->flags.clear();
-
-    return self_ptr;
-}
+#include "player-info/self-info-util.h"

diff --git a/src/player-info/self-info-util.h b/src/player-info/self-info-util.h
index 6f1c71b..432734d 100644 (file)
--- a/src/player-info/self-info-util.h
+++ b/src/player-info/self-info-util.h
@@ -1,16 +1,14 @@
 #pragma once
 
-#include "system/angband.h"
 #include "system/item-entity.h"
 
 struct self_info_type {
-    int line;
-    char v_string[8][128];
-    char s_string[6][128];
-    TrFlags flags;
-    char plev_buf[80];
-    char buf[2][80];
-    concptr info[220];
+    self_info_type() = default;
+    int line = 0;
+    char v_string[8][128]{};
+    char s_string[6][128]{};
+    TrFlags flags{};
+    char plev_buf[80]{};
+    char buf[2][80]{};
+    const char *info[220]{};
 };
-
-self_info_type *initialize_self_info_type(self_info_type *self_ptr);

diff --git a/src/player-info/self-info.cpp b/src/player-info/self-info.cpp
index 7d7320a..de80834 100644 (file)
--- a/src/player-info/self-info.cpp
+++ b/src/player-info/self-info.cpp
@@ -249,7 +249,7 @@ static void set_esp_info(PlayerType *player_ptr, self_info_type *self_ptr)
 void self_knowledge(PlayerType *player_ptr)
 {
     self_info_type tmp_si;
-    self_info_type *self_ptr = initialize_self_info_type(&tmp_si);
+    self_info_type *self_ptr = &tmp_si;
     display_life_rating(player_ptr, self_ptr);
     chg_virtue(player_ptr, Virtue::KNOWLEDGE, 1);
     chg_virtue(player_ptr, Virtue::ENLIGHTEN, 1);