OSDN Git Service

(root) / hengbandforosx / hengbandosx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[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 5c2e64b..0d61858 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -50,7 +50,7 @@ static BIT_FLAGS check_equipment_flags(player_type *creature_ptr, tr_type tr_fla
         object_flags(creature_ptr, o_ptr, flgs);
 
         if (has_flag(flgs, tr_flag))
-            result |= 0x01 << (i - INVEN_MAIN_HAND);
+            result |= 0x01U << (i - INVEN_MAIN_HAND);
     }
     return result;
 }
@@ -151,7 +151,7 @@ BIT_FLAGS has_esp_evil(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
     if (creature_ptr->realm1 == REALM_HEX) {
         if (hex_spelling(creature_ptr, HEX_DETECT_EVIL))
-            result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+            result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
     result |= check_equipment_flags(creature_ptr, TR_ESP_EVIL);
     return result;
@@ -244,24 +244,24 @@ BIT_FLAGS has_esp_telepathy(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (is_time_limit_esp(creature_ptr) || creature_ptr->ult_res || (creature_ptr->special_defense & KATA_MUSOU)) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->muta3 & MUT3_ESP) {
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_MIND_FLAYER) && creature_ptr->lev > 29)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (is_specific_player_race(creature_ptr, RACE_SPECTRE) && creature_ptr->lev > 34)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->pclass == CLASS_MINDCRAFTER && creature_ptr->lev > 39)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_TELEPATHY);
@@ -335,17 +335,17 @@ BIT_FLAGS has_reflect(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_BERSERKER && creature_ptr->lev > 39)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->pclass == CLASS_MIRROR_MASTER && creature_ptr->lev > 39)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->special_defense & KAMAE_GENBU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res || creature_ptr->wraith_form || creature_ptr->magicdef || creature_ptr->tim_reflect) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_REFLECT);
@@ -369,7 +369,7 @@ BIT_FLAGS has_warning(player_type *creature_ptr)
 
         if (has_flag(flgs, TR_WARNING)) {
             if (!o_ptr->inscription || !(angband_strchr(quark_str(o_ptr->inscription), '$')))
-                result |= 0x01 << (i - INVEN_MAIN_HAND);
+                result |= 0x01U << (i - INVEN_MAIN_HAND);
         }
     }
     return result;
@@ -384,19 +384,19 @@ BIT_FLAGS has_sh_fire(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->muta3 & MUT3_FIRE_BODY) {
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
     }
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (hex_spelling(creature_ptr, HEX_DEMON_AURA) || creature_ptr->ult_res || creature_ptr->tim_sh_fire) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SH_FIRE);
@@ -408,14 +408,14 @@ BIT_FLAGS has_sh_elec(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->muta3 & MUT3_ELEC_TOUC)
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
 
     if (hex_spelling(creature_ptr, HEX_SHOCK_CLOAK) || creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || (creature_ptr->special_defense & KATA_MUSOU)) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SH_ELEC);
@@ -427,11 +427,11 @@ BIT_FLAGS has_sh_cold(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res || hex_spelling(creature_ptr, HEX_ICE_ARMOR)) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SH_COLD);
@@ -447,31 +447,31 @@ BIT_FLAGS has_hold_exp(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
-        result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+        result |= 0x01U << FLAG_CAUSE_PERSONALITY;
     }
 
     if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_HOBBIT) || is_specific_player_race(creature_ptr, RACE_SKELETON)
         || is_specific_player_race(creature_ptr, RACE_ZOMBIE) || is_specific_player_race(creature_ptr, RACE_VAMPIRE)
         || is_specific_player_race(creature_ptr, RACE_SPECTRE) || is_specific_player_race(creature_ptr, RACE_BALROG)
         || is_specific_player_race(creature_ptr, RACE_ANDROID)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_GOLEM)) {
         if (creature_ptr->lev > 34)
-            result |= 0x01 << FLAG_CAUSE_RACE;
+            result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_HOLD_EXP);
@@ -483,28 +483,28 @@ BIT_FLAGS has_see_inv(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_NINJA && creature_ptr->lev > 29)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     } else if (is_specific_player_race(creature_ptr, RACE_HIGH_ELF) || is_specific_player_race(creature_ptr, RACE_GOLEM)
         || is_specific_player_race(creature_ptr, RACE_SKELETON) || is_specific_player_race(creature_ptr, RACE_ZOMBIE)
         || is_specific_player_race(creature_ptr, RACE_SPECTRE) || is_specific_player_race(creature_ptr, RACE_ARCHON)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     } else if (is_specific_player_race(creature_ptr, RACE_DARK_ELF) && creature_ptr->lev > 19) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     } else if (is_specific_player_race(creature_ptr, RACE_MIND_FLAYER) && creature_ptr->lev > 14) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     } else if ((is_specific_player_race(creature_ptr, RACE_IMP) || is_specific_player_race(creature_ptr, RACE_BALROG)) && creature_ptr->lev > 9) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res || creature_ptr->tim_invis) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SEE_INVIS);
@@ -518,37 +518,37 @@ BIT_FLAGS has_free_act(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->muta3 & MUT3_MOTION)
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
 
     if (is_specific_player_race(creature_ptr, RACE_GNOME) || is_specific_player_race(creature_ptr, RACE_GOLEM)
         || is_specific_player_race(creature_ptr, RACE_SPECTRE) || is_specific_player_race(creature_ptr, RACE_ANDROID)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->pclass == CLASS_NINJA && !heavy_armor(creature_ptr)
         && (!creature_ptr->inventory_list[INVEN_MAIN_HAND].k_idx || can_attack_with_main_hand(creature_ptr))
         && (!creature_ptr->inventory_list[INVEN_SUB_HAND].k_idx || can_attack_with_sub_hand(creature_ptr))) {
         if (creature_ptr->lev > 24)
-            result |= 0x01 << FLAG_CAUSE_CLASS;
+            result |= 0x01U << FLAG_CAUSE_CLASS;
     }
 
     if (creature_ptr->pclass == CLASS_MONK || creature_ptr->pclass == CLASS_FORCETRAINER) {
         if (!(heavy_armor(creature_ptr))) {
             if (creature_ptr->lev > 24)
-                result |= 0x01 << FLAG_CAUSE_CLASS;
+                result |= 0x01U << FLAG_CAUSE_CLASS;
         }
     }
 
     if (creature_ptr->pclass == CLASS_BERSERKER) {
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
     }
 
     if (creature_ptr->ult_res || creature_ptr->magicdef) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_FREE_ACT);
@@ -560,19 +560,19 @@ BIT_FLAGS has_sustain_str(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_BERSERKER) {
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
     }
     if (is_specific_player_race(creature_ptr, RACE_HALF_TROLL) || is_specific_player_race(creature_ptr, RACE_HALF_OGRE)
         || is_specific_player_race(creature_ptr, RACE_HALF_GIANT)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SUST_STR);
@@ -584,15 +584,15 @@ BIT_FLAGS has_sustain_int(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (is_specific_player_race(creature_ptr, RACE_MIND_FLAYER)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SUST_INT);
@@ -603,20 +603,19 @@ 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 |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_MIND_FLAYER)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SUST_WIS);
@@ -627,18 +626,18 @@ BIT_FLAGS has_sustain_dex(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
     if (creature_ptr->pclass == CLASS_BERSERKER) {
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
     }
 
     if (creature_ptr->pclass == CLASS_NINJA && creature_ptr->lev > 24)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SUST_DEX);
@@ -649,19 +648,19 @@ BIT_FLAGS has_sustain_con(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
     if (creature_ptr->pclass == CLASS_BERSERKER) {
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
     }
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_AMBERITE || creature_ptr->prace == RACE_DUNADAN)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SUST_CON);
@@ -673,11 +672,11 @@ BIT_FLAGS has_sustain_chr(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_SUST_CHR);
@@ -688,25 +687,26 @@ 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) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+    if (creature_ptr->ult_res || creature_ptr->magicdef) {
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->riding) {
@@ -716,7 +716,7 @@ BIT_FLAGS has_levitation(player_type *creature_ptr)
     }
 
     if (creature_ptr->tim_levitation) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_LEVITATION);
@@ -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,17 +754,17 @@ 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) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     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);
@@ -776,30 +776,30 @@ BIT_FLAGS has_regenerate(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (is_specific_player_race(creature_ptr, RACE_HALF_TROLL) && creature_ptr->lev > 14) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_AMBERITE)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->pclass == CLASS_WARRIOR && creature_ptr->lev > 44) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->pclass == CLASS_BERSERKER) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->muta3 & MUT3_REGEN)
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
     }
 
     if (hex_spelling(creature_ptr, HEX_DEMON_AURA) || creature_ptr->ult_res || creature_ptr->tim_regen) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_REGEN);
@@ -914,19 +914,19 @@ BIT_FLAGS has_resist_acid(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     } else if (is_specific_player_race(creature_ptr, RACE_YEEK) || is_specific_player_race(creature_ptr, RACE_KLACKON)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     } else if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 14) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= has_immune_acid(creature_ptr);
@@ -939,11 +939,11 @@ BIT_FLAGS has_vuln_acid(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
     if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
     }
 
     if (creature_ptr->special_defense & KATA_KOUKIJIN) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
     return result;
 }
@@ -953,17 +953,17 @@ BIT_FLAGS has_resist_elec(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     } else if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 19) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_ELEC);
@@ -975,15 +975,15 @@ BIT_FLAGS has_vuln_elec(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
     if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_ANDROID)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_KOUKIJIN) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
     return result;
 }
@@ -993,23 +993,23 @@ BIT_FLAGS has_resist_fire(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 4) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_IMP || creature_ptr->prace == RACE_BALROG)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_FIRE);
@@ -1021,15 +1021,15 @@ BIT_FLAGS has_vuln_fire(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
     if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_ENT)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_KOUKIJIN) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
     return result;
 }
@@ -1039,27 +1039,27 @@ BIT_FLAGS has_resist_cold(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_ZOMBIE) && creature_ptr->lev > 4) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if ((is_specific_player_race(creature_ptr, RACE_DRACONIAN) || is_specific_player_race(creature_ptr, RACE_SKELETON)) && creature_ptr->lev > 9) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_VAMPIRE || creature_ptr->prace == RACE_SPECTRE)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_COLD);
@@ -1071,11 +1071,11 @@ BIT_FLAGS has_vuln_cold(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
     if (creature_ptr->muta3 & MUT3_VULN_ELEM) {
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
     }
 
     if (creature_ptr->special_defense & KATA_KOUKIJIN) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
     return result;
 }
@@ -1085,28 +1085,28 @@ BIT_FLAGS has_resist_pois(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_NINJA && creature_ptr->lev > 19)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->mimic_form == MIMIC_VAMPIRE || creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (is_specific_player_race(creature_ptr, RACE_DRACONIAN) && creature_ptr->lev > 34) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form
         && (creature_ptr->prace == RACE_KOBOLD || creature_ptr->prace == RACE_GOLEM || creature_ptr->prace == RACE_SKELETON
             || creature_ptr->prace == RACE_VAMPIRE || creature_ptr->prace == RACE_SPECTRE || creature_ptr->prace == RACE_ANDROID)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KAMAE_SEIRYU || creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_POIS);
@@ -1118,26 +1118,26 @@ BIT_FLAGS has_resist_conf(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_MINDCRAFTER && creature_ptr->lev > 29)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->pseikaku == PERSONALITY_CHARGEMAN || creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
-        result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+        result |= 0x01U << FLAG_CAUSE_PERSONALITY;
     }
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_KLACKON || creature_ptr->prace == RACE_BEASTMAN || creature_ptr->prace == RACE_KUTAR)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->ult_res || creature_ptr->magicdef) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_CONF);
@@ -1149,19 +1149,19 @@ BIT_FLAGS has_resist_sound(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_BARD) {
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
     }
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_CYCLOPS || creature_ptr->prace == RACE_BEASTMAN)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_SOUND);
@@ -1173,15 +1173,15 @@ BIT_FLAGS has_resist_lite(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_ELF || creature_ptr->prace == RACE_HIGH_ELF || creature_ptr->prace == RACE_SPRITE)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_LITE);
@@ -1193,11 +1193,11 @@ BIT_FLAGS has_vuln_lite(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
     if (is_specific_player_race(creature_ptr, RACE_S_FAIRY) || is_specific_player_race(creature_ptr, RACE_VAMPIRE)
         || (creature_ptr->mimic_form == MIMIC_VAMPIRE)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->wraith_form) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     return result;
@@ -1208,21 +1208,21 @@ BIT_FLAGS has_resist_dark(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_VAMPIRE) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form
         && (creature_ptr->prace == RACE_HALF_ORC || creature_ptr->prace == RACE_HALF_OGRE || creature_ptr->prace == RACE_NIBELUNG
             || creature_ptr->prace == RACE_DARK_ELF || creature_ptr->prace == RACE_VAMPIRE)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_DARK);
@@ -1234,21 +1234,21 @@ BIT_FLAGS has_resist_chaos(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pclass == CLASS_CHAOS_WARRIOR && creature_ptr->lev > 29)
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_HALF_TITAN)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_CHAOS);
@@ -1260,18 +1260,18 @@ BIT_FLAGS has_resist_disen(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_NIBELUNG)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_DISEN);
@@ -1283,14 +1283,14 @@ BIT_FLAGS has_resist_shard(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (!creature_ptr->mimic_form && (creature_ptr->prace == RACE_HALF_GIANT || creature_ptr->prace == RACE_SKELETON))
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_SHARDS);
@@ -1302,15 +1302,15 @@ BIT_FLAGS has_resist_nexus(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_NEXUS);
@@ -1322,18 +1322,18 @@ BIT_FLAGS has_resist_blind(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
-        result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+        result |= 0x01U << FLAG_CAUSE_PERSONALITY;
     }
 
     if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_DWARF)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res || creature_ptr->magicdef) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_BLIND);
@@ -1345,20 +1345,20 @@ BIT_FLAGS has_resist_neth(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD || creature_ptr->mimic_form == MIMIC_DEMON || creature_ptr->mimic_form == MIMIC_VAMPIRE) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form
         && (creature_ptr->prace == RACE_ZOMBIE || creature_ptr->prace == RACE_VAMPIRE || creature_ptr->prace == RACE_SPECTRE
             || creature_ptr->prace == RACE_BALROG))
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (creature_ptr->ult_res || creature_ptr->tim_res_nether) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_NETHER);
@@ -1370,7 +1370,7 @@ BIT_FLAGS has_resist_time(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->tim_res_time) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_TIME);
@@ -1382,7 +1382,7 @@ BIT_FLAGS has_resist_water(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_MERFOLK)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     result |= check_equipment_flags(creature_ptr, TR_RES_WATER);
     return result;
@@ -1393,41 +1393,41 @@ BIT_FLAGS has_resist_fear(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (creature_ptr->muta3 & MUT3_FEARLESS)
-        result |= 0x01 << FLAG_CAUSE_MUTATION;
+        result |= 0x01U << FLAG_CAUSE_MUTATION;
 
     switch (creature_ptr->pclass) {
     case CLASS_WARRIOR:
     case CLASS_SAMURAI:
         if (creature_ptr->lev > 29)
-            result |= 0x01 << FLAG_CAUSE_CLASS;
+            result |= 0x01U << FLAG_CAUSE_CLASS;
         break;
     case CLASS_PALADIN:
     case CLASS_CHAOS_WARRIOR:
         if (creature_ptr->lev > 39)
-            result |= 0x01 << FLAG_CAUSE_CLASS;
+            result |= 0x01U << FLAG_CAUSE_CLASS;
         break;
     case CLASS_MINDCRAFTER:
         if (creature_ptr->lev > 9)
-            result |= 0x01 << FLAG_CAUSE_CLASS;
+            result |= 0x01U << FLAG_CAUSE_CLASS;
         break;
     case CLASS_NINJA:
-        result |= 0x01 << FLAG_CAUSE_CLASS;
+        result |= 0x01U << FLAG_CAUSE_CLASS;
         break;
     }
 
     if (creature_ptr->mimic_form == MIMIC_DEMON_LORD) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_BARBARIAN)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if ((creature_ptr->special_defense & KATA_MUSOU)) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     if (is_hero(creature_ptr) || is_shero(creature_ptr) || creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_RES_FEAR);
@@ -1438,11 +1438,11 @@ BIT_FLAGS has_immune_acid(player_type *creature_ptr)
 {
     BIT_FLAGS result = 0L;
     if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_YEEK && creature_ptr->lev > 19)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->ele_immune) {
         if (creature_ptr->special_defense & DEFENSE_ACID)
-            result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+            result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_IM_ACID);
@@ -1455,7 +1455,7 @@ BIT_FLAGS has_immune_elec(player_type *creature_ptr)
 
     if (creature_ptr->ele_immune) {
         if (creature_ptr->special_defense & DEFENSE_ELEC)
-            result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+            result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_IM_ELEC);
@@ -1468,7 +1468,7 @@ BIT_FLAGS has_immune_fire(player_type *creature_ptr)
 
     if (creature_ptr->ele_immune) {
         if (creature_ptr->special_defense & DEFENSE_FIRE)
-            result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+            result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_IM_FIRE);
@@ -1481,7 +1481,7 @@ BIT_FLAGS has_immune_cold(player_type *creature_ptr)
 
     if (creature_ptr->ele_immune) {
         if (creature_ptr->special_defense & DEFENSE_COLD)
-            result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+            result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     result |= check_equipment_flags(creature_ptr, TR_IM_COLD);
@@ -1493,11 +1493,11 @@ BIT_FLAGS has_immune_dark(player_type *creature_ptr)
     BIT_FLAGS result = 0L;
 
     if (is_specific_player_race(creature_ptr, RACE_VAMPIRE) || (creature_ptr->mimic_form == MIMIC_VAMPIRE)) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (creature_ptr->wraith_form) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     return result;
@@ -1578,22 +1578,22 @@ BIT_FLAGS has_lite(player_type *creature_ptr)
         return 0L;
 
     if (creature_ptr->pseikaku == PERSONALITY_MUNCHKIN) {
-        result |= 0x01 << FLAG_CAUSE_PERSONALITY;
+        result |= 0x01U << FLAG_CAUSE_PERSONALITY;
     }
 
     if (creature_ptr->mimic_form == MIMIC_VAMPIRE) {
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
     }
 
     if (!creature_ptr->mimic_form && creature_ptr->prace == RACE_VAMPIRE)
-        result |= 0x01 << FLAG_CAUSE_RACE;
+        result |= 0x01U << FLAG_CAUSE_RACE;
 
     if (creature_ptr->ult_res) {
-        result |= 0x01 << FLAG_CAUSE_MAGIC_TIME_EFFECT;
+        result |= 0x01U << FLAG_CAUSE_MAGIC_TIME_EFFECT;
     }
 
     if (creature_ptr->special_defense & KATA_MUSOU) {
-        result |= 0x01 << FLAG_CAUSE_BATTLE_FORM;
+        result |= 0x01U << FLAG_CAUSE_BATTLE_FORM;
     }
 
     result |= has_sh_fire(creature_ptr);
@@ -1631,18 +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;
-        is_suitable_weapon |= o_ptr->tval != TV_POLEARM;
-        return !is_bare_hands && !is_suitable_weapon;
+        is_suitable_weapon |= (o_ptr->tval != TV_SWORD) && (o_ptr->tval != TV_POLEARM);
+        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))
The master and develop branches track hengband.
About OSDN
Find Software
Develop Software
Help