[Refactor] monster_spell_type と RF_ABILITY を統合する

[hengbandforosx/hengbandosx.git] / src / mspell / mspell-curse.cpp

diff --git a/src/mspell/mspell-curse.cpp b/src/mspell/mspell-curse.cpp
index e2c1ffd..d8b807f 100644 (file)
--- a/src/mspell/mspell-curse.cpp
+++ b/src/mspell/mspell-curse.cpp
@@ -1,11 +1,11 @@
 #include "mspell/mspell-curse.h"
 #include "core/disturbance.h"
 #include "effect/effect-processor.h"
+#include "monster-race/race-ability-flags.h"
 #include "monster/monster-info.h"
 #include "monster/monster-list.h"
 #include "mspell/mspell-checker.h"
 #include "mspell/mspell-damage-calculator.h"
-#include "mspell/mspell-type.h"
 #include "mspell/mspell-util.h"
 #include "mspell/mspell.h"
 #include "spell/spell-types.h"
@@ -77,7 +77,7 @@ MonsterSpellResult spell_RF5_CAUSE_1(player_type *target_ptr, POSITION y, POSITI
     concptr msg2 = _("%^sがあなたを指さして呪った。", "%^s points at you and curses.");
     concptr msg3 = _("%^sは%sを指さして呪いをかけた。", "%^s points at %s and curses.");
 
-    const auto dam = monspell_damage(target_ptr, (MS_CAUSE_1), m_idx, DAM_ROLL);
+    const auto dam = monspell_damage(target_ptr, RF_ABILITY::CAUSE_1, m_idx, DAM_ROLL);
 
     return spell_RF5_CAUSE(target_ptr, GF_CAUSE_1, dam, y, x, m_idx, t_idx, msg1, msg2, msg3, TARGET_TYPE);
 }
@@ -99,7 +99,7 @@ MonsterSpellResult spell_RF5_CAUSE_2(player_type *target_ptr, POSITION y, POSITI
     concptr msg2 = _("%^sがあなたを指さして恐ろしげに呪った。", "%^s points at you and curses horribly.");
     concptr msg3 = _("%^sは%sを指さして恐ろしげに呪いをかけた。", "%^s points at %s and curses horribly.");
 
-    const auto dam = monspell_damage(target_ptr, (MS_CAUSE_2), m_idx, DAM_ROLL);
+    const auto dam = monspell_damage(target_ptr, RF_ABILITY::CAUSE_2, m_idx, DAM_ROLL);
 
     return spell_RF5_CAUSE(target_ptr, GF_CAUSE_2, dam, y, x, m_idx, t_idx, msg1, msg2, msg3, TARGET_TYPE);
 }
@@ -121,7 +121,7 @@ MonsterSpellResult spell_RF5_CAUSE_3(player_type *target_ptr, POSITION y, POSITI
     concptr msg2 = _("%^sがあなたを指さして恐ろしげに呪文を唱えた！", "%^s points at you, incanting terribly!");
     concptr msg3 = _("%^sは%sを指さし、恐ろしげに呪文を唱えた！", "%^s points at %s, incanting terribly!");
 
-    const auto dam = monspell_damage(target_ptr, (MS_CAUSE_3), m_idx, DAM_ROLL);
+    const auto dam = monspell_damage(target_ptr, RF_ABILITY::CAUSE_3, m_idx, DAM_ROLL);
 
     return spell_RF5_CAUSE(target_ptr, GF_CAUSE_3, dam, y, x, m_idx, t_idx, msg1, msg2, msg3, TARGET_TYPE);
 }
@@ -143,7 +143,7 @@ MonsterSpellResult spell_RF5_CAUSE_4(player_type *target_ptr, POSITION y, POSITI
     concptr msg2 = _("%^sがあなたの秘孔を突いて「お前は既に死んでいる」と叫んだ。", "%^s points at you, screaming the word DIE!");
     concptr msg3 = _("%^sが%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", "%^s points at %s, screaming the word, 'DIE!'");
 
-    const auto dam = monspell_damage(target_ptr, (MS_CAUSE_4), m_idx, DAM_ROLL);
+    const auto dam = monspell_damage(target_ptr, RF_ABILITY::CAUSE_4, m_idx, DAM_ROLL);
 
     return spell_RF5_CAUSE(target_ptr, GF_CAUSE_4, dam, y, x, m_idx, t_idx, msg1, msg2, msg3, TARGET_TYPE);
 }