[refactor] モンスターの種族フラグのRF4～RF6を統合する

[hengbandforosx/hengbandosx.git] / src / mspell / mspell-attack-util.cpp

diff --git a/src/mspell/mspell-attack-util.cpp b/src/mspell/mspell-attack-util.cpp
index a6c295c..a0db412 100644 (file)
--- a/src/mspell/mspell-attack-util.cpp
+++ b/src/mspell/mspell-attack-util.cpp
@@ -9,16 +9,13 @@ msa_type *initialize_msa_type(player_type *target_ptr, msa_type *msa_ptr, MONSTE
     msa_ptr->m_ptr = &target_ptr->current_floor_ptr->m_list[m_idx];
     msa_ptr->r_ptr = &r_info[msa_ptr->m_ptr->r_idx];
     msa_ptr->no_inate = randint0(100) >= (msa_ptr->r_ptr->freq_spell * 2);
-    msa_ptr->f4 = msa_ptr->r_ptr->flags4;
-    msa_ptr->f5 = msa_ptr->r_ptr->a_ability_flags1;
-    msa_ptr->f6 = msa_ptr->r_ptr->a_ability_flags2;
+    msa_ptr->ability_flags = msa_ptr->r_ptr->ability_flags;
     msa_ptr->x = target_ptr->x;
     msa_ptr->y = target_ptr->y;
     msa_ptr->x_br_lite = 0;
     msa_ptr->y_br_lite = 0;
     msa_ptr->do_spell = DO_SPELL_NONE;
     msa_ptr->dam = 0;
-    msa_ptr->num = 0;
-    msa_ptr->thrown_spell = 0;
+    msa_ptr->thrown_spell = RF_ABILITY::MAX;
     return msa_ptr;
 }