[Refactor] #38844 new_mane を player_type 構造体に移動．

[hengband/hengband.git] / src / mspells1.c

diff --git a/src/mspells1.c b/src/mspells1.c
index e0ff777..d59c82e 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -39,12 +39,24 @@
  */
 
 #include "angband.h"
+#include "util.h"
+
+#include "floor.h"
+#include "dungeon.h"
+#include "grid.h"
 #include "object-curse.h"
-#include "projection.h"
 #include "quest.h"
 #include "realm-hex.h"
 #include "player-move.h"
 #include "player-status.h"
+#include "monster.h"
+#include "monster-spell.h"
+#include "spells.h"
+#include "world.h"
+#include "realm-song.h"
+#include "view-mainwindow.h"
+#include "player-race.h"
+#include "player-class.h"
 
 
 /*!
@@ -249,7 +261,7 @@ static void remove_bad_spells(MONSTER_IDX m_idx, u32b *f4p, u32b *f5p, u32b *f6p
 
        if (smart & (SM_RES_NETH))
        {
-               if (prace_is_(RACE_SPECTRE))
+               if (PRACE_IS_(RACE_SPECTRE))
                {
                        f4 &= ~(RF4_BR_NETH);
                        f5 &= ~(RF5_BA_NETH);
@@ -271,7 +283,7 @@ static void remove_bad_spells(MONSTER_IDX m_idx, u32b *f4p, u32b *f5p, u32b *f6p
 
        if (smart & (SM_RES_DARK))
        {
-               if (prace_is_(RACE_VAMPIRE))
+               if (PRACE_IS_(RACE_VAMPIRE))
                {
                        f4 &= ~(RF4_BR_DARK);
                        f5 &= ~(RF5_BA_DARK);
@@ -938,7 +950,6 @@ bool dispel_check(MONSTER_IDX m_idx)
        if ((p_ptr->special_attack & ATTACK_COLD) && !(r_ptr->flagsr & RFR_EFF_IM_COLD_MASK)) return (TRUE);
        if ((p_ptr->special_attack & ATTACK_POIS) && !(r_ptr->flagsr & RFR_EFF_IM_POIS_MASK)) return (TRUE);
 
-       /* Speed */
        if (p_ptr->pspeed < 145)
        {
                if (IS_FAST()) return (TRUE);
@@ -1786,7 +1797,7 @@ bool make_attack_spell(MONSTER_IDX m_idx)
                        p_ptr->mane_spell[p_ptr->mane_num] = thrown_spell - 96;
                        p_ptr->mane_dam[p_ptr->mane_num] = dam;
                        p_ptr->mane_num++;
-                       new_mane = TRUE;
+                       p_ptr->new_mane = TRUE;
 
                        p_ptr->redraw |= (PR_IMITATION);
                }