[Refactor] #40514 player_type の resist_shard 変数を廃止. / Abolished the resist_shard...

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 5c8a8de..9b2315a 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -230,11 +230,11 @@ void effect_player_shards(player_type *target_ptr, effect_player_type *ep_ptr)
 
     ep_ptr->dam = ep_ptr->dam * calc_shards_damage_rate(target_ptr, CALC_RAND) / 100;
 
-    if (!target_ptr->resist_shard && !check_multishadow(target_ptr)) {
+    if (!has_resist_shard(target_ptr) && !check_multishadow(target_ptr)) {
         (void)set_cut(target_ptr, target_ptr->cut + ep_ptr->dam);
     }
 
-    if (!target_ptr->resist_shard || one_in_(13))
+    if (!has_resist_shard(target_ptr) || one_in_(13))
         inventory_damage(target_ptr, set_cold_destroy, 2);
 
     ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
@@ -321,11 +321,11 @@ void effect_player_rocket(player_type *target_ptr, effect_player_type *ep_ptr)
 
     ep_ptr->dam = ep_ptr->dam * calc_rocket_damage_rate(target_ptr, CALC_RAND) / 100;
 
-    if (!target_ptr->resist_shard && !check_multishadow(target_ptr)) {
+    if (!has_resist_shard(target_ptr) && !check_multishadow(target_ptr)) {
         (void)set_cut(target_ptr, target_ptr->cut + (ep_ptr->dam / 2));
     }
 
-    if (!target_ptr->resist_shard || one_in_(12)) {
+    if (!has_resist_shard(target_ptr) || one_in_(12)) {
         inventory_damage(target_ptr, set_cold_destroy, 3);
     }
 
@@ -543,7 +543,7 @@ void effect_player_meteor(player_type *target_ptr, effect_player_type *ep_ptr)
         msg_print(_("何かが空からあなたの頭上に落ちてきた！", "Something falls from the sky on you!"));
 
     ep_ptr->get_damage = take_hit(target_ptr, DAMAGE_ATTACK, ep_ptr->dam, ep_ptr->killer, ep_ptr->monspell);
-    if (!target_ptr->resist_shard || one_in_(13)) {
+    if (!has_resist_shard(target_ptr) || one_in_(13)) {
         if (!has_immune_fire(target_ptr))
             inventory_damage(target_ptr, set_fire_destroy, 2);
         inventory_damage(target_ptr, set_cold_destroy, 2);
@@ -559,7 +559,7 @@ void effect_player_icee(player_type *target_ptr, effect_player_type *ep_ptr)
     if (check_multishadow(target_ptr))
         return;
 
-    if (!target_ptr->resist_shard) {
+    if (!has_resist_shard(target_ptr)) {
         (void)set_cut(target_ptr, target_ptr->cut + damroll(5, 8));
     }
 

diff --git a/src/monster/monster-update.c b/src/monster/monster-update.c
index bc81d56..ae0f181 100644 (file)
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -641,7 +641,7 @@ void update_smart_learn(player_type *player_ptr, MONSTER_IDX m_idx, int what)
 
         break;
     case DRS_SHARD:
-        if (player_ptr->resist_shard)
+        if (has_resist_shard(player_ptr))
             m_ptr->smart |= SM_RES_SHARD;
 
         break;

diff --git a/src/mspell/high-resistance-checker.c b/src/mspell/high-resistance-checker.c
index 4b8d1f7..2e6570a 100644 (file)
--- a/src/mspell/high-resistance-checker.c
+++ b/src/mspell/high-resistance-checker.c
@@ -39,7 +39,7 @@ void add_cheat_remove_flags_others(player_type *target_ptr, msr_type *msr_ptr)
     if (has_resist_sound(target_ptr))
         msr_ptr->smart |= SM_RES_SOUND;
 
-    if (target_ptr->resist_shard)
+    if (has_resist_shard(target_ptr))
         msr_ptr->smart |= SM_RES_SHARD;
 
     if (target_ptr->reflect)

diff --git a/src/player-info/resistance-info.c b/src/player-info/resistance-info.c
index 2023df1..3abd611 100644 (file)
--- a/src/player-info/resistance-info.c
+++ b/src/player-info/resistance-info.c
@@ -78,7 +78,7 @@ void set_high_resistance_info(player_type *creature_ptr, self_info_type *self_pt
     if (has_resist_chaos(creature_ptr))
         self_ptr->info[self_ptr->line++] = _("あなたはカオスの力への耐性を持っている。", "You are resistant to chaos.");
     
-    if (creature_ptr->resist_shard)
+    if (has_resist_shard(creature_ptr))
         self_ptr->info[self_ptr->line++] = _("あなたは破片の攻撃への耐性を持っている。", "You are resistant to blasts of shards.");
     
     if (creature_ptr->resist_nexus)

diff --git a/src/player/player-status-resist.c b/src/player/player-status-resist.c
index 47f5f5b..77d7045 100644 (file)
--- a/src/player/player-status-resist.c
+++ b/src/player/player-status-resist.c
@@ -272,7 +272,7 @@ PERCENTAGE calc_shards_damage_rate(player_type *creature_ptr, rate_calc_type_mod
 {
     PERCENTAGE per = 100;
 
-    if (creature_ptr->resist_shard) {
+    if (has_resist_shard(creature_ptr)) {
         per *= 600;
         per /= randrate(4, 7, mode);
     }
@@ -363,7 +363,7 @@ PERCENTAGE calc_rocket_damage_rate(player_type *creature_ptr, rate_calc_type_mod
     (void)mode; // unused
     PERCENTAGE per = 100;
 
-    if (creature_ptr->resist_shard) {
+    if (has_resist_shard(creature_ptr)) {
         per /= 2;
     }
 

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 1092eeb..598c831 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -394,7 +394,6 @@ void calc_bonuses(player_type *creature_ptr)
     has_curses(creature_ptr);
     creature_ptr->impact = has_impact(creature_ptr);
     has_extra_blow(creature_ptr);
-    creature_ptr->resist_shard = has_resist_shard(creature_ptr);
     creature_ptr->resist_nexus = has_resist_nexus(creature_ptr);
     creature_ptr->resist_blind = has_resist_blind(creature_ptr);
     creature_ptr->resist_neth = has_resist_neth(creature_ptr);

diff --git a/src/player/player-status.h b/src/player/player-status.h
index 541c06b..fb76443 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -366,7 +366,6 @@ typedef struct player_type {
     bool is_fired;
     bool level_up_message;
 
-    BIT_FLAGS resist_shard; /* Resist shards */
     BIT_FLAGS resist_nexus; /* Resist nexus */
     BIT_FLAGS resist_blind; /* Resist blindness */
     BIT_FLAGS resist_neth; /* Resist nether */