プレイヤーが両手持ち可能な状態判定をマクロCAN_TWO_HANDS_WIELDING()に

まとめた.

diff --git a/src/cmd3.c b/src/cmd3.c
index cf23e29..42e7e3a 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -550,14 +550,14 @@ msg_print("
        switch (slot)
        {
        case INVEN_RARM:
-               if (object_allow_two_hands_wielding(o_ptr) && (empty_hands(FALSE) == EMPTY_HAND_LARM) && (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)))
+               if (object_allow_two_hands_wielding(o_ptr) && (empty_hands(FALSE) == EMPTY_HAND_LARM) && CAN_TWO_HANDS_WIELDING())
                        act = STR_WIELD_ARMS;
                else
                        act = (left_hander ? STR_WIELD_LARM : STR_WIELD_RARM);
                break;
 
        case INVEN_LARM:
-               if (object_allow_two_hands_wielding(o_ptr) && (empty_hands(FALSE) == EMPTY_HAND_RARM) && (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)))
+               if (object_allow_two_hands_wielding(o_ptr) && (empty_hands(FALSE) == EMPTY_HAND_RARM) && CAN_TWO_HANDS_WIELDING())
                        act = STR_WIELD_ARMS;
                else
                        act = (left_hander ? STR_WIELD_RARM : STR_WIELD_LARM);
@@ -656,7 +656,7 @@ void kamaenaoshi(int item)
                                p_ptr->total_weight += o_ptr->weight;
                                inven_item_increase(INVEN_LARM, -((int)o_ptr->number));
                                inven_item_optimize(INVEN_LARM);
-                               if (object_allow_two_hands_wielding(o_ptr) && (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)))
+                               if (object_allow_two_hands_wielding(o_ptr) && CAN_TWO_HANDS_WIELDING())
 #ifdef JP
                                        msg_format("%s¤òξ¼ê¤Ç¹½¤¨¤¿¡£", o_name);
 #else
@@ -671,7 +671,7 @@ void kamaenaoshi(int item)
                        }
                        else
                        {
-                               if (object_allow_two_hands_wielding(o_ptr) && (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)))
+                               if (object_allow_two_hands_wielding(o_ptr) && CAN_TWO_HANDS_WIELDING())
 #ifdef JP
                                        msg_format("%s¤òξ¼ê¤Ç¹½¤¨¤¿¡£", o_name);
 #else
@@ -687,7 +687,7 @@ void kamaenaoshi(int item)
 
                if (buki_motteruka(INVEN_RARM))
                {
-                       if (object_allow_two_hands_wielding(o_ptr) && (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)))
+                       if (object_allow_two_hands_wielding(o_ptr) && CAN_TWO_HANDS_WIELDING())
 #ifdef JP
                                msg_format("%s¤òξ¼ê¤Ç¹½¤¨¤¿¡£", o_name);
 #else

diff --git a/src/defines.h b/src/defines.h
index c27baae..b85605d 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -616,6 +616,9 @@
 #define PF_RYOUTE       0x0040
 
 
+#define CAN_TWO_HANDS_WIELDING() (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE))
+
+
 /*
  * There is a 1/20 (5%) chance of inflating the requested object_level
  * during the creation of an object (see "get_obj_num()" in "object.c").

diff --git a/src/xtra1.c b/src/xtra1.c
index bf33aab..c385703 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -3139,7 +3139,7 @@ void calc_bonuses(void)
                if (!p_ptr->migite) default_hand = 1;
        }
 
-       if (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE))
+       if (CAN_TWO_HANDS_WIELDING())
        {
                if (p_ptr->migite && (empty_hands(FALSE) == EMPTY_HAND_LARM) &&
                        object_allow_two_hands_wielding(&inventory[INVEN_RARM]))