[Refactor] #40514 player_type の resist_conf 変数を廃止. / Abolished the resist_conf variab...

[hengband/hengband.git] / src / player / eldritch-horror.c

diff --git a/src/player/eldritch-horror.c b/src/player/eldritch-horror.c
index a504500..2e5437f 100644 (file)
--- a/src/player/eldritch-horror.c
+++ b/src/player/eldritch-horror.c
@@ -5,9 +5,9 @@
  */
 
 #include "player/eldritch-horror.h"
+#include "player/player-status-flags.h"
+#include "core/player-update-types.h"
 #include "core/stuff-handler.h"
-#include "floor/floor.h"
-#include "locale/vowel-checker.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
@@ -19,11 +19,18 @@
 #include "monster/monster-list.h"
 #include "monster/monster-util.h"
 #include "monster/smart-learn-types.h"
-#include "player/player-effects.h"
+#include "mutation/mutation-flag-types.h"
+#include "status/bad-status-setter.h"
 #include "player/player-status.h"
 #include "player/mimic-info-table.h"
+#include "status/base-status.h"
+#include "system/floor-type-definition.h"
 #include "view/display-messages.h"
 #include "world/world.h"
+#ifdef JP
+#else
+#include "locale/english.h"
+#endif
 
 /*!
  * @brief エルドリッチホラーの形容詞種別を決める
@@ -249,7 +256,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
         break;
     }
     case 4: {
-        if (!(creature_ptr->muta2 & MUT2_BERS_RAGE) && !creature_ptr->resist_conf) {
+        if (!(creature_ptr->muta2 & MUT2_BERS_RAGE) && !has_resist_conf(creature_ptr)) {
             msg_print(_("激烈な感情の発作におそわれるようになった！", "You become subject to fits of berserk rage!"));
             creature_ptr->muta2 |= MUT2_BERS_RAGE;
         }
@@ -264,7 +271,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
     case 10:
     case 11:
     case 12: {
-        if (!creature_ptr->resist_conf) {
+        if (!has_resist_conf(creature_ptr)) {
             (void)set_confused(creature_ptr, creature_ptr->confused + randint0(4) + 4);
         }
 
@@ -279,7 +286,7 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
     case 13:
     case 14:
     case 15: {
-        if (!creature_ptr->resist_conf) {
+        if (!has_resist_conf(creature_ptr)) {
             (void)set_confused(creature_ptr, creature_ptr->confused + randint0(4) + 4);
         }
         if (!creature_ptr->free_act) {