Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband

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

diff --git a/src/player/eldritch-horror.c b/src/player/eldritch-horror.c
index ac5b444..fde0c38 100644 (file)
--- a/src/player/eldritch-horror.c
+++ b/src/player/eldritch-horror.c
@@ -5,21 +5,31 @@
  */
 
 #include "player/eldritch-horror.h"
+#include "core/player-update-types.h"
 #include "core/stuff-handler.h"
-#include "floor/floor.h"
+#include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/monster-race-hook.h"
 #include "monster/horror-descriptions.h"
 #include "monster/monster-describer.h"
-#include "monster/smart-learn-types.h"
+#include "monster/monster-info.h"
+#include "monster/monster-list.h"
 #include "monster/monster-util.h"
-#include "monster/monster2.h"
-#include "player/player-effects.h"
+#include "monster/smart-learn-types.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 エルドリッチホラーの形容詞種別を決める
@@ -120,12 +130,12 @@ void sanity_blast(player_type *creature_ptr, monster_type *m_ptr, bool necro)
         }
 
         see_eldritch_horror(m_name, r_ptr);
-        if (PRACE_IS_(creature_ptr, RACE_IMP) || PRACE_IS_(creature_ptr, RACE_BALROG) || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)
+        if (is_specific_player_race(creature_ptr, RACE_IMP) || is_specific_player_race(creature_ptr, RACE_BALROG) || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)
             || current_world_ptr->wizard)
             return;
 
-        if (PRACE_IS_(creature_ptr, RACE_SKELETON) || PRACE_IS_(creature_ptr, RACE_ZOMBIE) || PRACE_IS_(creature_ptr, RACE_VAMPIRE)
-            || PRACE_IS_(creature_ptr, RACE_SPECTRE) || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_UNDEAD)) {
+        if (is_specific_player_race(creature_ptr, RACE_SKELETON) || is_specific_player_race(creature_ptr, RACE_ZOMBIE) || is_specific_player_race(creature_ptr, RACE_VAMPIRE)
+            || is_specific_player_race(creature_ptr, RACE_SPECTRE) || (mimic_info[creature_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_UNDEAD)) {
             if (saving_throw(25 + creature_ptr->lev))
                 return;
         }