[Refactor] #39962 files.h にあったフラグと構造体をdisplay-characteristic.c/h に移動 / Moved flags...

diff --git a/src/files.c b/src/files.c
index afb18a3..609af10 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -16,7 +16,6 @@
 #include "term.h"
 #include "signal-handlers.h"
 #include "view/display-player.h" // 暫定。後で消す
-#include "view/display-util.h"
 #include "uid-checker.h"
 #include "files.h"
 #include "core.h" // リファクタリングして後で消す

diff --git a/src/files.h b/src/files.h
index 923583f..1d56a89 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -2,11 +2,6 @@
 
 #define TOKENIZE_CHECKQUOTE 0x01  /* Special handling of single quotes */
 
-/* Mode flags for displaying player flags */
-#define DP_CURSE   0x01
-#define DP_IMM     0x02
-#define DP_WP      0x08
-
 extern char savefile[1024];
 extern char savefile_base[40];
 
@@ -24,18 +19,6 @@ extern concptr ANGBAND_DIR_SAVE;
 extern concptr ANGBAND_DIR_USER;
 extern concptr ANGBAND_DIR_XTRA;
 
-/*
- * A struct for storing misc. flags
- */
-typedef struct {
-       BIT_FLAGS player_flags[TR_FLAG_SIZE];
-       BIT_FLAGS tim_player_flags[TR_FLAG_SIZE];
-       BIT_FLAGS player_imm[TR_FLAG_SIZE];
-       BIT_FLAGS tim_player_imm[TR_FLAG_SIZE];
-       BIT_FLAGS player_vuln[TR_FLAG_SIZE];
-       BIT_FLAGS known_obj_imm[TR_FLAG_SIZE];
-} all_player_flags;
-
 extern s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode);
 extern errr file_character(player_type *creature_ptr, concptr name);
 extern errr process_pref_file_command(player_type *creature_ptr, char *buf);

diff --git a/src/player/permanent-resistances.h b/src/player/permanent-resistances.h
index c58580f..ace81f6 100644 (file)
--- a/src/player/permanent-resistances.h
+++ b/src/player/permanent-resistances.h
@@ -2,4 +2,4 @@
 
 #include "angband.h"
 
-void player_flags(player_type *creature_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]);
+void player_flags(player_type *creature_ptr, BIT_FLAGS *flags);

diff --git a/src/view/display-characteristic.c b/src/view/display-characteristic.c
index 17a1531..439df1d 100644 (file)
--- a/src/view/display-characteristic.c
+++ b/src/view/display-characteristic.c
@@ -4,6 +4,15 @@
 #include "player/temporary-resistances.h"
 #include "player/race-resistances.h"
 
+typedef struct {
+       BIT_FLAGS player_flags[TR_FLAG_SIZE];
+       BIT_FLAGS tim_player_flags[TR_FLAG_SIZE];
+       BIT_FLAGS player_imm[TR_FLAG_SIZE];
+       BIT_FLAGS tim_player_imm[TR_FLAG_SIZE];
+       BIT_FLAGS player_vuln[TR_FLAG_SIZE];
+       BIT_FLAGS known_obj_imm[TR_FLAG_SIZE];
+} all_player_flags;
+
 /*!
  * @brief プレイヤーの特性フラグ一種を表示する
  * Helper function, see below

diff --git a/src/view/display-characteristic.h b/src/view/display-characteristic.h
index 33f999a..30a2a03 100644 (file)
--- a/src/view/display-characteristic.h
+++ b/src/view/display-characteristic.h
@@ -1,7 +1,11 @@
 #pragma once
 
 #include "angband.h"
-#include "files.h" // 消すかどうか検討中.
+
+/* Mode flags for displaying player flags */
+#define DP_CURSE   0x01
+#define DP_IMM     0x02
+#define DP_WP      0x08
 
 void display_player_flag_info(player_type *creature_ptr, void(*display_player_equippy)(player_type*, TERM_LEN, TERM_LEN, BIT_FLAGS16));
 void display_player_flag_info_2(player_type *creature_ptr, void(*display_player_equippy)(player_type*, TERM_LEN, TERM_LEN, BIT_FLAGS16));