[Refactor] #37353 プレイヤーマクロのいくつかを player-status.h に移動。 / Some player status macros...

diff --git a/src/chest.c b/src/chest.c
index 6f7fa97..b05e9f0 100644 (file)
--- a/src/chest.c
+++ b/src/chest.c
@@ -1,6 +1,7 @@
 
 #include "angband.h"
 #include "spells-summon.h"
+#include "player-status.h"
 
 /*!
 * @brief 箱からアイテムを引き出す /

diff --git a/src/cmd-quaff.c b/src/cmd-quaff.c
index 2554112..5f3dc37 100644 (file)
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -12,6 +12,7 @@
 #include "mutation.h"
 #include "avatar.h"
 #include "spells-status.h"
+#include "player-status.h"
 #include "realm-hex.h"
 #include "spells-floor.h"
 #include "object-broken.h"

diff --git a/src/defines.h b/src/defines.h
index 3e59d41..9108712 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -4605,21 +4605,6 @@ extern int PlayerUID;
 #define SUB_ALIGN_EVIL    0x0001
 #define SUB_ALIGN_GOOD    0x0002
 
-/* Temporary flags macro */
-#define IS_FAST() (p_ptr->fast || music_singing(MUSIC_SPEED) || music_singing(MUSIC_SHERO))
-#define IS_INVULN() (p_ptr->invuln || music_singing(MUSIC_INVULN))
-#define IS_HERO() (p_ptr->hero || music_singing(MUSIC_HERO) || music_singing(MUSIC_SHERO))
-#define IS_BLESSED() (p_ptr->blessed || music_singing(MUSIC_BLESS) || hex_spelling(HEX_BLESS))
-#define IS_OPPOSE_ACID() (p_ptr->oppose_acid || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
-#define IS_OPPOSE_ELEC() (p_ptr->oppose_elec || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
-#define IS_OPPOSE_FIRE() (p_ptr->oppose_fire || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
-#define IS_OPPOSE_COLD() (p_ptr->oppose_cold || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
-#define IS_OPPOSE_POIS() (p_ptr->oppose_pois || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
-#define IS_TIM_ESP() (p_ptr->tim_esp || music_singing(MUSIC_MIND) || (p_ptr->concent >= CONCENT_TELE_THRESHOLD))
-#define IS_TIM_STEALTH() (p_ptr->tim_stealth || music_singing(MUSIC_STEALTH))
-
-#define P_PTR_KI (p_ptr->magic_num1[0])
-
 #define IS_WIZARD_CLASS() \
        (p_ptr->pclass == CLASS_MAGE || p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER || p_ptr->pclass == CLASS_MAGIC_EATER || p_ptr->pclass == CLASS_BLUE_MAGE)
 

diff --git a/src/grid.c b/src/grid.c
index ffbc76b..dd3ade0 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -29,6 +29,7 @@
 #include "quest.h"
 #include "feature.h"
 #include "monster-status.h"
+#include "player-status.h"
 
 static byte display_autopick; /*!< 自動拾い状態の設定フラグ */
 static int match_autopick;

diff --git a/src/monster2.c b/src/monster2.c
index 3c7aa5e..91a2d34 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -22,6 +22,7 @@
 #include "player-move.h"
 #include "wild.h"
 #include "warning.h"
+#include "player-status.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */

diff --git a/src/mspells1.c b/src/mspells1.c
index 3dc4222..a835437 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -44,6 +44,7 @@
 #include "quest.h"
 #include "realm-hex.h"
 #include "player-move.h"
+#include "player-status.h"
 
 
 /*!

diff --git a/src/player-damage.c b/src/player-damage.c
index c25b3f2..aa6a1ee 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -3,6 +3,7 @@
 #include "artifact.h"
 #include "object-hook.h"
 #include "object-broken.h"
+#include "player-status.h"
 
 
 /*!

diff --git a/src/player-status.h b/src/player-status.h
index 8734962..5dfb035 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -19,3 +19,18 @@ extern void free_turn(player_type *creature_ptr);
 extern bool player_place(POSITION y, POSITION x);
 
 extern void wreck_the_pattern(void);
+
+/* Temporary flags macro */
+#define IS_FAST() (p_ptr->fast || music_singing(MUSIC_SPEED) || music_singing(MUSIC_SHERO))
+#define IS_INVULN() (p_ptr->invuln || music_singing(MUSIC_INVULN))
+#define IS_HERO() (p_ptr->hero || music_singing(MUSIC_HERO) || music_singing(MUSIC_SHERO))
+#define IS_BLESSED() (p_ptr->blessed || music_singing(MUSIC_BLESS) || hex_spelling(HEX_BLESS))
+#define IS_OPPOSE_ACID() (p_ptr->oppose_acid || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
+#define IS_OPPOSE_ELEC() (p_ptr->oppose_elec || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
+#define IS_OPPOSE_FIRE() (p_ptr->oppose_fire || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
+#define IS_OPPOSE_COLD() (p_ptr->oppose_cold || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
+#define IS_OPPOSE_POIS() (p_ptr->oppose_pois || music_singing(MUSIC_RESIST) || (p_ptr->special_defense & KATA_MUSOU))
+#define IS_TIM_ESP() (p_ptr->tim_esp || music_singing(MUSIC_MIND) || (p_ptr->concent >= CONCENT_TELE_THRESHOLD))
+#define IS_TIM_STEALTH() (p_ptr->tim_stealth || music_singing(MUSIC_STEALTH))
+
+#define P_PTR_KI (p_ptr->magic_num1[0])
\ No newline at end of file

diff --git a/src/trap.c b/src/trap.c
index 982d038..6a5774d 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -8,6 +8,7 @@
 #include "quest.h"
 #include "artifact.h"
 #include "feature.h"
+#include "player-status.h"
 
 static s16b normal_traps[MAX_NORMAL_TRAPS];
 

diff --git a/src/warning.c b/src/warning.c
index e23ae8d..2ec588f 100644 (file)
--- a/src/warning.c
+++ b/src/warning.c
@@ -5,6 +5,7 @@
 #include "player-move.h"
 #include "feature.h"
 #include "warning.h"
+#include "player-status.h"
 
 /*!
  * @brief 警告を放つアイテムを選択する /