[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 d92510f..0d61858 100644 (file)
--- a/src/player/player-status-flags.c
+++ b/src/player/player-status-flags.c
@@ -42,7 +42,7 @@ static BIT_FLAGS check_equipment_flags(player_type *creature_ptr, tr_type tr_fla
     object_type *o_ptr;
     BIT_FLAGS flgs[TR_FLAG_SIZE];
     BIT_FLAGS result = 0L;
-    for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+    for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &creature_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
@@ -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_RARM);
+            result |= 0x01U << (i - INVEN_MAIN_HAND);
     }
     return result;
 }
@@ -141,7 +141,6 @@ BIT_FLAGS has_infra_vision(player_type *creature_ptr)
     return result;
 }
 
-
 /*!
  * @brief クリーチャーが邪悪感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
@@ -152,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;
@@ -163,110 +162,77 @@ BIT_FLAGS has_esp_evil(player_type *creature_ptr)
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_animal(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_ANIMAL);
-}
+BIT_FLAGS has_esp_animal(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_ANIMAL); }
 
 /*!
  * @brief クリーチャーがアンデッド感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_undead(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_UNDEAD);
-}
+BIT_FLAGS has_esp_undead(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_UNDEAD); }
 
 /*!
  * @brief クリーチャーが悪魔感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_demon(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_DEMON);
-}
+BIT_FLAGS has_esp_demon(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_DEMON); }
 
 /*!
  * @brief クリーチャーがオーク感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_orc(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_ORC);
-}
+BIT_FLAGS has_esp_orc(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_ORC); }
 
 /*!
  * @brief クリーチャーがトロル感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_troll(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_TROLL);
-}
+BIT_FLAGS has_esp_troll(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_TROLL); }
 
 /*!
  * @brief クリーチャーが巨人感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_giant(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_GIANT);
-}
+BIT_FLAGS has_esp_giant(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_GIANT); }
 
 /*!
  * @brief クリーチャーがドラゴン感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_dragon(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_DRAGON);
-}
+BIT_FLAGS has_esp_dragon(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_DRAGON); }
 
 /*!
  * @brief クリーチャーが人間感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_human(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_HUMAN);
-}
+BIT_FLAGS has_esp_human(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_HUMAN); }
 
 /*!
  * @brief クリーチャーが善良感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_good(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_GOOD);
-}
+BIT_FLAGS has_esp_good(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_GOOD); }
 
 /*!
  * @brief クリーチャーが無生物感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_nonliving(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_NONLIVING);
-}
+BIT_FLAGS has_esp_nonliving(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_NONLIVING); }
 
 /*!
  * @brief クリーチャーがユニーク感知を持っているかを返す。
  * @param creature_ptr 判定対象のクリーチャー参照ポインタ
  * @return 持っていたら所持前提ビットフラグを返す。
  */
-BIT_FLAGS has_esp_unique(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_ESP_UNIQUE);
-}
+BIT_FLAGS has_esp_unique(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_ESP_UNIQUE); }
 
 /*!
  * @brief クリーチャーがテレパシーを持っているかを返す。
@@ -278,49 +244,37 @@ 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);
     return result;
 }
 
-BIT_FLAGS has_bless_blade(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_BLESSED);
-}
+BIT_FLAGS has_bless_blade(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_BLESSED); }
 
-BIT_FLAGS has_easy2_weapon(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_EASY2_WEAPON);
-}
+BIT_FLAGS has_easy2_weapon(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_EASY2_WEAPON); }
 
-BIT_FLAGS has_down_saving(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_DOWN_SAVING);
-}
+BIT_FLAGS has_down_saving(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_DOWN_SAVING); }
 
-BIT_FLAGS has_no_ac(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_NO_AC);
-}
+BIT_FLAGS has_no_ac(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_NO_AC); }
 
 BIT_FLAGS has_invuln_arrow(player_type *creature_ptr)
 {
@@ -372,33 +326,26 @@ void check_no_flowed(player_type *creature_ptr)
     }
 }
 
-BIT_FLAGS has_mighty_throw(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_MIGHTY_THROW);
-}
-
-BIT_FLAGS has_dec_mana(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_DEC_MANA);
-}
+BIT_FLAGS has_mighty_throw(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_MIGHTY_THROW); }
 
+BIT_FLAGS has_dec_mana(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_DEC_MANA); }
 
 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);
@@ -413,7 +360,7 @@ BIT_FLAGS has_warning(player_type *creature_ptr)
     object_type *o_ptr;
     BIT_FLAGS flgs[TR_FLAG_SIZE];
 
-    for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+    for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &creature_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
@@ -422,40 +369,34 @@ 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_RARM);
+                result |= 0x01U << (i - INVEN_MAIN_HAND);
         }
     }
     return result;
 }
 
-BIT_FLAGS has_anti_magic(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_NO_MAGIC);
-}
+BIT_FLAGS has_anti_magic(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_NO_MAGIC); }
 
-BIT_FLAGS has_anti_tele(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_NO_TELE);
-}
+BIT_FLAGS has_anti_tele(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_NO_TELE); }
 
 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);
@@ -467,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);
@@ -486,57 +427,51 @@ 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);
     return result;
 }
 
-BIT_FLAGS has_easy_spell(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_EASY_SPELL);
-}
+BIT_FLAGS has_easy_spell(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_EASY_SPELL); }
 
-BIT_FLAGS has_heavy_spell(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_HEAVY_SPELL);
-}
+BIT_FLAGS has_heavy_spell(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_HEAVY_SPELL); }
 
 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);
@@ -548,74 +483,72 @@ 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);
     return result;
 }
 
-BIT_FLAGS has_magic_mastery(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_MAGIC_MASTERY);
-}
+BIT_FLAGS has_magic_mastery(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_MAGIC_MASTERY); }
 
 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_RARM].k_idx || has_right_hand_weapon(creature_ptr))
-        && (!creature_ptr->inventory_list[INVEN_LARM].k_idx || has_left_hand_weapon(creature_ptr))) {
+    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);
@@ -627,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);
@@ -651,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);
@@ -670,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);
@@ -694,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);
@@ -716,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);
@@ -740,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);
@@ -755,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) {
@@ -783,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);
@@ -806,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
@@ -821,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);
@@ -843,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);
@@ -886,7 +819,7 @@ void has_curses(player_type *creature_ptr)
     if (creature_ptr->pseikaku == PERSONALITY_SEXY)
         creature_ptr->cursed |= (TRC_AGGRAVATE);
 
-    for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+    for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &creature_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
@@ -949,10 +882,7 @@ void has_curses(player_type *creature_ptr)
         creature_ptr->cursed &= ~(TRC_TELEPORT_SELF);
 }
 
-BIT_FLAGS has_impact(player_type *creature_ptr)
-{
-    return check_equipment_flags(creature_ptr, TR_IMPACT);
-}
+BIT_FLAGS has_impact(player_type *creature_ptr) { return check_equipment_flags(creature_ptr, TR_IMPACT); }
 
 void has_extra_blow(player_type *creature_ptr)
 {
@@ -960,16 +890,16 @@ void has_extra_blow(player_type *creature_ptr)
     BIT_FLAGS flgs[TR_FLAG_SIZE];
     creature_ptr->extra_blows[0] = creature_ptr->extra_blows[1] = 0;
 
-    for (inventory_slot_type i = INVEN_RARM; i < INVEN_TOTAL; i++) {
+    for (inventory_slot_type i = INVEN_MAIN_HAND; i < INVEN_TOTAL; i++) {
         o_ptr = &creature_ptr->inventory_list[i];
         if (!o_ptr->k_idx)
             continue;
 
         object_flags(creature_ptr, o_ptr, flgs);
         if (has_flag(flgs, TR_BLOWS)) {
-            if ((i == INVEN_RARM || i == INVEN_RIGHT) && !has_two_handed_weapons(creature_ptr))
+            if ((i == INVEN_MAIN_HAND || i == INVEN_MAIN_RING) && !has_two_handed_weapons(creature_ptr))
                 creature_ptr->extra_blows[0] += o_ptr->pval;
-            else if ((i == INVEN_LARM || i == INVEN_LEFT) && !has_two_handed_weapons(creature_ptr))
+            else if ((i == INVEN_SUB_HAND || i == INVEN_SUB_RING) && !has_two_handed_weapons(creature_ptr))
                 creature_ptr->extra_blows[1] += o_ptr->pval;
             else {
                 creature_ptr->extra_blows[0] += o_ptr->pval;
@@ -984,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);
@@ -1009,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;
 }
@@ -1023,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);
@@ -1045,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;
 }
@@ -1063,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);
@@ -1091,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;
 }
@@ -1109,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);
@@ -1141,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;
 }
@@ -1155,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);
@@ -1188,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);
@@ -1219,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);
@@ -1243,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);
@@ -1263,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;
@@ -1278,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);
@@ -1304,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);
@@ -1330,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);
@@ -1353,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);
@@ -1372,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);
@@ -1392,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);
@@ -1415,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);
@@ -1440,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);
@@ -1452,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;
@@ -1463,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);
@@ -1508,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);
@@ -1525,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);
@@ -1538,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);
@@ -1551,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);
@@ -1563,45 +1493,78 @@ 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;
 }
 
+melee_type player_melee_type(player_type *creature_ptr)
+{
+    if (has_two_handed_weapons(creature_ptr))
+        return MELEE_TYPE_WEAPON_TWOHAND;
+
+    if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND)) {
+        if (has_melee_weapon(creature_ptr, INVEN_SUB_HAND)) {
+            return MELEE_TYPE_WEAPON_DOUBLE;
+        }
+        return MELEE_TYPE_WEAPON_MAIN;
+    }
+
+    if (has_melee_weapon(creature_ptr, INVEN_SUB_HAND))
+        return MELEE_TYPE_WEAPON_SUB;
+
+    if (empty_hands(creature_ptr, FALSE) == (EMPTY_HAND_MAIN | EMPTY_HAND_SUB))
+        return MELEE_TYPE_BAREHAND_TWO;
+
+    if (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_MAIN)
+        return MELEE_TYPE_BAREHAND_MAIN;
+
+    if (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_SUB)
+        return MELEE_TYPE_BAREHAND_SUB;
+
+    return MELEE_TYPE_SHIELD_DOUBLE;
+}
+
 /*
- * @brief 右手(利き手)が武器を持っているかどうかを判定する
+ * @brief 利き手で攻撃可能かどうかを判定する
+ *        利き手で攻撃可能とは、利き手に武器を持っているか、
+ *        利き手が素手かつ左手も素手もしくは盾を装備している事を意味する。
  * @detail Includes martial arts and hand combats as weapons.
  */
-bool has_right_hand_weapon(player_type *creature_ptr)
+bool can_attack_with_main_hand(player_type *creature_ptr)
 {
-    if (has_melee_weapon(creature_ptr, INVEN_RARM))
+    if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND))
         return TRUE;
 
-    if ((empty_hands(creature_ptr, TRUE) & EMPTY_HAND_RARM) && !has_left_hand_weapon(creature_ptr))
+    if ((empty_hands(creature_ptr, TRUE) & EMPTY_HAND_MAIN) && !can_attack_with_sub_hand(creature_ptr))
         return TRUE;
 
     return FALSE;
 }
 
 /*
- * @brief 左手(非利き手)が武器を持っているかどうかを判定する
+ * @brief 非利き手で攻撃可能かどうかを判定する
+ *        非利き手で攻撃可能とは、非利き手に武器を持っている事に等しい
  * @detail Exclude martial arts and hand combats from weapons.
  */
-bool has_left_hand_weapon(player_type *creature_ptr) { return has_melee_weapon(creature_ptr, INVEN_LARM); }
+bool can_attack_with_sub_hand(player_type *creature_ptr) { return has_melee_weapon(creature_ptr, INVEN_SUB_HAND); }
 
+/*
+ * @brief 両手持ち状態かどうかを判定する
+ */
 bool has_two_handed_weapons(player_type *creature_ptr)
 {
     if (can_two_hands_wielding(creature_ptr)) {
-        if (has_right_hand_weapon(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_LARM)
-            && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_RARM])) {
+        if (can_attack_with_main_hand(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_SUB)
+            && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_MAIN_HAND])) {
             return TRUE;
-        } else if (has_left_hand_weapon(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_RARM)
-            && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_LARM])) {
+        } else if (can_attack_with_sub_hand(creature_ptr) && (empty_hands(creature_ptr, FALSE) == EMPTY_HAND_MAIN)
+            && object_allow_two_hands_wielding(&creature_ptr->inventory_list[INVEN_SUB_HAND])) {
             return TRUE;
         }
     }
@@ -1615,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);
@@ -1646,8 +1609,8 @@ BIT_FLAGS has_lite(player_type *creature_ptr)
  */
 bool has_disable_two_handed_bonus(player_type *creature_ptr, int i)
 {
-    if (has_melee_weapon(creature_ptr, INVEN_RARM + i) && has_two_handed_weapons(creature_ptr)) {
-        object_type *o_ptr = &creature_ptr->inventory_list[INVEN_RARM + i];
+    if (has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i) && has_two_handed_weapons(creature_ptr)) {
+        object_type *o_ptr = &creature_ptr->inventory_list[INVEN_MAIN_HAND + i];
         int limit = calc_weapon_weight_limit(creature_ptr) * 2;
 
         /* Enable when two hand wields an enough light weapon */
@@ -1665,26 +1628,25 @@ bool has_disable_two_handed_bonus(player_type *creature_ptr, int i)
 bool has_icky_wield_weapon(player_type *creature_ptr, int i)
 {
     BIT_FLAGS flgs[TR_FLAG_SIZE];
-    object_type *o_ptr = &creature_ptr->inventory_list[INVEN_RARM + 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))
         return TRUE;
-    
+
     return FALSE;
 }
 
@@ -1692,7 +1654,7 @@ bool has_riding_wield_weapon(player_type *creature_ptr, int i)
 {
     object_type *o_ptr;
     BIT_FLAGS flgs[TR_FLAG_SIZE];
-    o_ptr = &creature_ptr->inventory_list[INVEN_RARM + i];
+    o_ptr = &creature_ptr->inventory_list[INVEN_MAIN_HAND + i];
     object_flags(creature_ptr, o_ptr, flgs);
     if (creature_ptr->riding != 0 && !(o_ptr->tval == TV_POLEARM) && ((o_ptr->sval == SV_LANCE) || (o_ptr->sval == SV_HEAVY_LANCE))
         && !has_flag(flgs, TR_RIDING)) {
@@ -1703,24 +1665,23 @@ bool has_riding_wield_weapon(player_type *creature_ptr, int i)
 
 bool has_not_ninja_weapon(player_type *creature_ptr, int i)
 {
-    if (!has_melee_weapon(creature_ptr, INVEN_RARM + i)) {
+    if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i)) {
         return FALSE;
     }
-    tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN;
-    OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval;
+    tval_type tval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].tval - TV_WEAPON_BEGIN;
+    OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].sval;
     return creature_ptr->pclass == CLASS_NINJA
-        && !((s_info[CLASS_NINJA].w_max[tval][sval] > WEAPON_EXP_BEGINNER) && (creature_ptr->inventory_list[INVEN_LARM - i].tval != TV_SHIELD));
+        && !((s_info[CLASS_NINJA].w_max[tval][sval] > WEAPON_EXP_BEGINNER) && (creature_ptr->inventory_list[INVEN_SUB_HAND - i].tval != TV_SHIELD));
 }
 
 bool has_not_monk_weapon(player_type *creature_ptr, int i)
 {
-    if (!has_melee_weapon(creature_ptr, INVEN_RARM + i)) {
+    if (!has_melee_weapon(creature_ptr, INVEN_MAIN_HAND + i)) {
         return FALSE;
     }
-    tval_type tval = creature_ptr->inventory_list[INVEN_RARM + i].tval - TV_WEAPON_BEGIN;
-    OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_RARM + i].sval;
-    return ((creature_ptr->pclass == CLASS_MONK) || (creature_ptr->pclass == CLASS_FORCETRAINER))
-        && !(s_info[creature_ptr->pclass].w_max[tval][sval]);
+    tval_type tval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].tval - TV_WEAPON_BEGIN;
+    OBJECT_SUBTYPE_VALUE sval = creature_ptr->inventory_list[INVEN_MAIN_HAND + i].sval;
+    return ((creature_ptr->pclass == CLASS_MONK) || (creature_ptr->pclass == CLASS_FORCETRAINER)) && !(s_info[creature_ptr->pclass].w_max[tval][sval]);
 }
 
 bool has_good_luck(player_type *creature_ptr) { return (creature_ptr->pseikaku == PERSONALITY_LUCKY) || (creature_ptr->muta3 & MUT3_GOOD_LUCK); }
@@ -1733,8 +1694,8 @@ BIT_FLAGS player_aggravate_state(player_type *creature_ptr)
         }
         return AGGRAVATE_NORMAL;
     }
-    
-    return AGGRAVATE_NONE; 
+
+    return AGGRAVATE_NONE;
 }
 
 bool has_aggravate(player_type *creature_ptr) { return player_aggravate_state(creature_ptr) == AGGRAVATE_NORMAL; }