Merge branch 'For2.2.2-Refactoring' into For3.0.0-Monster-Adjustment

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index 4594feb..8bcdda5 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -209,7 +209,7 @@ void spell_RF5_SCARE(MONSTER_IDX m_idx, player_type *target_ptr, MONSTER_IDX t_i
     bool resist, saving_throw;
 
     if (TARGET_TYPE == MONSTER_TO_PLAYER) {
-        resist = (bool)target_ptr->resist_fear;
+        resist = (target_ptr->resist_fear != 0);
         saving_throw = (randint0(100 + rlev / 2) < target_ptr->skill_sav);
         spell_badstatus_message(target_ptr, m_idx, t_idx, _("%^sが何かをつぶやくと、恐ろしげな音が聞こえた。", "%^s mumbles, and you hear scary noises."),
             _("%^sが恐ろしげな幻覚を作り出した。", "%^s casts a fearful illusion."), _("しかし恐怖に侵されなかった。", "You refuse to be frightened."),

diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index faf60cc..249b24b 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -501,6 +501,14 @@ BIT_FLAGS has_see_inv(player_type *creature_ptr)
     return result;
 }
 
+BIT_FLAGS has_magic_mastery(player_type *creature_ptr)
+{
+    BIT_FLAGS result = 0L;
+
+    result |= check_equipment_flags(creature_ptr, TR_MAGIC_MASTERY);
+    return result;
+}
+
 BIT_FLAGS has_free_act(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;

diff --git a/src/player/player-status-flags.h b/src/player/player-status-flags.h
index 1ba3dc2..9506e67 100644 (file)
--- a/src/player/player-status-flags.h
+++ b/src/player/player-status-flags.h
@@ -58,6 +58,7 @@ BIT_FLAGS has_easy_spell(player_type *creature_ptr);
 BIT_FLAGS has_heavy_spell(player_type *creature_ptr);
 BIT_FLAGS has_hold_exp(player_type *creature_ptr);
 BIT_FLAGS has_see_inv(player_type *creature_ptr);
+BIT_FLAGS has_magic_mastery(player_type *creature_ptr);
 BIT_FLAGS has_free_act(player_type *creature_ptr);
 BIT_FLAGS is_sustain_str(player_type *creature_ptr);
 BIT_FLAGS is_sustain_int(player_type *creature_ptr);