X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fmonster-attack%2Fmonster-attack-switcher.c;h=8bba812d273dbea1864d72a5eb1582a256854946;hb=6ef5dd154bb29e054179494563ed5ffe0d4710c6;hp=3647c76dca63a7c1d1f38ed84c5dd00c27c0fa87;hpb=34c4d48d2156a7684e8daaba27bf2d6333f69024;p=hengband%2Fhengband.git

diff --git a/src/monster-attack/monster-attack-switcher.c b/src/monster-attack/monster-attack-switcher.c
index 3647c76dc..8bba812d2 100644
--- a/src/monster-attack/monster-attack-switcher.c
+++ b/src/monster-attack/monster-attack-switcher.c
@@ -38,7 +38,7 @@ static void calc_blow_poison(player_type *target_ptr, monap_type *monap_ptr)
     if (monap_ptr->explode)
         return;
 
-    if (!(target_ptr->resist_pois || is_oppose_pois(target_ptr)) && !check_multishadow(target_ptr)
+    if (!(has_resist_pois(target_ptr) || is_oppose_pois(target_ptr)) && !check_multishadow(target_ptr)
         && set_poisoned(target_ptr, target_ptr->poisoned + randint1(monap_ptr->rlev) + 5))
         monap_ptr->obvious = TRUE;
 
@@ -58,12 +58,12 @@ static void calc_blow_disenchant(player_type *target_ptr, monap_type *monap_ptr)
     if (monap_ptr->explode)
         return;
 
-    if (!target_ptr->resist_disen && !check_multishadow(target_ptr) && apply_disenchant(target_ptr, 0)) {
+    if (!has_resist_disen(target_ptr) && !check_multishadow(target_ptr) && apply_disenchant(target_ptr, 0)) {
         update_creature(target_ptr);
         monap_ptr->obvious = TRUE;
     }
 
-    if (is_resist_disen(target_ptr))
+    if (has_resist_disen(target_ptr))
         monap_ptr->damage = monap_ptr->damage * (randint1(4) + 4) / 9;
 
     monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
@@ -115,7 +115,7 @@ static void calc_blow_un_power(player_type *target_ptr, monap_type *monap_ptr)
  */
 static void calc_blow_blind(player_type *target_ptr, monap_type *monap_ptr)
 {
-    if (is_resist_blind(target_ptr))
+    if (has_resist_blind(target_ptr))
         monap_ptr->damage = monap_ptr->damage * (randint1(4) + 3) / 8;
 
     monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
@@ -137,14 +137,14 @@ static void calc_blow_confusion(player_type *target_ptr, monap_type *monap_ptr)
     if (monap_ptr->explode)
         return;
 
-    if (is_resist_conf(target_ptr))
+    if (has_resist_conf(target_ptr))
         monap_ptr->damage = monap_ptr->damage * (randint1(4) + 3) / 8;
 
     monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
     if (target_ptr->is_dead)
         return;
 
-    if (!target_ptr->resist_conf && !check_multishadow(target_ptr) && set_confused(target_ptr, target_ptr->confused + 3 + randint1(monap_ptr->rlev)))
+    if (!has_resist_conf(target_ptr) && !check_multishadow(target_ptr) && set_confused(target_ptr, target_ptr->confused + 3 + randint1(monap_ptr->rlev)))
         monap_ptr->obvious = TRUE;
 
     update_smart_learn(target_ptr, monap_ptr->m_idx, DRS_CONF);
@@ -158,7 +158,7 @@ static void calc_blow_confusion(player_type *target_ptr, monap_type *monap_ptr)
  */
 static void calc_blow_fear(player_type *target_ptr, monap_type *monap_ptr)
 {
-    if (is_resist_fear(target_ptr))
+    if (has_resist_fear(target_ptr))
         monap_ptr->damage = monap_ptr->damage * (randint1(4) + 3) / 8;
 
     monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
@@ -202,7 +202,7 @@ static void calc_blow_drain_exp(player_type *target_ptr, monap_type *monap_ptr,
     if (has_hold_exp(target_ptr))
         damage_ratio -= 75;
 
-    if (is_resist_neth(target_ptr))
+    if (has_resist_neth(target_ptr))
         damage_ratio -= 75;
 
     monap_ptr->damage = monap_ptr->damage * damage_ratio / 1000;
@@ -225,7 +225,7 @@ static void calc_blow_time(player_type *target_ptr, monap_type *monap_ptr)
         return;
 
     process_monster_attack_time(target_ptr, monap_ptr);
-    if (is_resist_time(target_ptr))
+    if (has_resist_time(target_ptr))
         monap_ptr->damage = monap_ptr->damage * (randint1(4) + 4) / 9;
 
     monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
@@ -321,18 +321,14 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt
     case RBE_UN_POWER:
         calc_blow_un_power(target_ptr, monap_ptr);
         break;
-    case RBE_EAT_GOLD: {
+    case RBE_EAT_GOLD:
         monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
-        if (monster_confused_remaining(monap_ptr->m_ptr))
-            break;
-
-        if (target_ptr->is_dead || check_multishadow(target_ptr))
+        if (monster_confused_remaining(monap_ptr->m_ptr) || target_ptr->is_dead || check_multishadow(target_ptr))
             break;
 
         monap_ptr->obvious = TRUE;
         process_eat_gold(target_ptr, monap_ptr);
         break;
-    }
     case RBE_EAT_ITEM: {
         monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
         if (!check_eat_item(target_ptr, monap_ptr))
@@ -469,7 +465,7 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt
     case RBE_INERTIA:
         calc_blow_inertia(target_ptr, monap_ptr);
         break;
-    case RBE_STUN: {
+    case RBE_STUN:
         monap_ptr->get_damage += take_hit(target_ptr, DAMAGE_ATTACK, monap_ptr->damage, monap_ptr->ddesc, -1);
         if (target_ptr->is_dead)
             break;
@@ -477,5 +473,4 @@ void switch_monster_blow_to_player(player_type *target_ptr, monap_type *monap_pt
         process_stun_attack(target_ptr, monap_ptr);
         break;
     }
-    }
 }