[Fix] #280 player-status-flags.c 内で論理和計算すべきところを即値代入しているミスを修正． / Corrected a mistake...

[hengbandforosx/hengbandosx.git] / src / player / player-status-flags.c

diff --git a/src/player/player-status-flags.c b/src/player/player-status-flags.c
index ec9640c..0d61858 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -603,7 +603,6 @@ BIT_FLAGS has_sustain_wis(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
 
-    result = FALSE;
     if (creature_ptr->pclass == CLASS_MINDCRAFTER && creature_ptr->lev > 19)
         result |= 0x01U << FLAG_CAUSE_CLASS;
 
@@ -688,24 +687,25 @@ BIT_FLAGS has_levitation(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
 
-    if (creature_ptr->muta3 & MUT3_WINGS)
-        result = FLAG_CAUSE_MUTATION;
+    if (creature_ptr->muta3 & MUT3_WINGS) {
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
+    }
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result = FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) || is_specific_player_race(creature_ptr, RACE_SPECTRE)
         || is_specific_player_race(creature_ptr, RACE_SPRITE) || is_specific_player_race(creature_ptr, RACE_ARCHON)
         || is_specific_player_race(creature_ptr, RACE_S_FAIRY)) {
-        result = FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KAMAE_SUZAKU || (creature_ptr->special_defense & KATA_MUSOU)) {
-        result = FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
-    if (creature_ptr->ult_res) {
+    if (creature_ptr->ult_res || creature_ptr->magicdef) {
         result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
@@ -739,12 +739,12 @@ BIT_FLAGS has_slow_digest(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_NINJA) {
-        result = FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
     }
 
     if (creature_ptr->lev > 14 && !creature_ptr->mimic_form && creature_ptr->prace == RACE_HALF_TROLL) {
         if (creature_ptr->pclass == CLASS_WARRIOR || creature_ptr->pclass == CLASS_BERSERKER) {
-            result = FLAG_CAUSE_CLASS;
+            result |= 0x01U << FLAG_CAUSE_CLASS;
             /* Let's not make Regeneration
              * a disadvantage for the poor warriors who can
              * never learn a spell that satisfies hunger (actually
@@ -754,7 +754,7 @@ BIT_FLAGS has_slow_digest(player_type *creature_ptr)
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result = FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
@@ -764,7 +764,7 @@ BIT_FLAGS has_slow_digest(player_type *creature_ptr)
     if (!creature_ptr->mimic_form
         && (creature_ptr->prace == RACE_GOLEM || creature_ptr->prace == RACE_ZOMBIE || creature_ptr->prace == RACE_SPECTRE
             || creature_ptr->prace == RACE_ANDROID)) {
-        result = FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SLOW_DIGEST);
@@ -1631,17 +1631,17 @@ bool has_icky_wield_weapon(player_type *creature_ptr, int i)
     object_type *o_ptr = &creature_ptr->inventory_list[INVEN_MAIN_HAND + i];
     object_flags(creature_ptr, o_ptr, flgs);
 
-    bool is_bare_hands = o_ptr->tval == TV_NONE;
+    bool has_no_weapon = (o_ptr->tval == TV_NONE) || (o_ptr->tval == TV_SHIELD);
     if (creature_ptr->pclass == CLASS_PRIEST) {
         bool is_suitable_weapon = has_flag(flgs, TR_BLESSED);
         is_suitable_weapon |= (o_ptr->tval != TV_SWORD) && (o_ptr->tval != TV_POLEARM);
-        return !is_bare_hands && !is_suitable_weapon;
+        return !has_no_weapon && !is_suitable_weapon;
     }
 
     if (creature_ptr->pclass == CLASS_SORCERER) {
         bool is_suitable_weapon = o_ptr->tval == TV_HAFTED;
         is_suitable_weapon &= (o_ptr->sval == SV_WIZSTAFF) || (o_ptr->sval == SV_NAMAKE_HAMMER);
-        return !is_bare_hands && !is_suitable_weapon;
+        return !has_no_weapon && !is_suitable_weapon;
     }
 
     if (has_not_monk_weapon(creature_ptr, i) || has_not_ninja_weapon(creature_ptr, i))