From 7dac62827c9a75e34dd7db356d20cbb65fe0f6e6 Mon Sep 17 00:00:00 2001
From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Sun, 28 Mar 2004 07:10:37 +0000
Subject: [PATCH] =?utf8?q?=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC?=
 =?utf8?q?=E3=81=8C=E4=B8=A1=E6=89=8B=E6=8C=81=E3=81=A1=E5=8F=AF=E8=83=BD?=
 =?utf8?q?=E3=81=AA=E7=8A=B6=E6=85=8B=E5=88=A4=E5=AE=9A=E3=82=92=E3=83=9E?=
 =?utf8?q?=E3=82=AF=E3=83=ADCAN=5FTWO=5FHANDS=5FWIELDING()=E3=81=AB=20?=
 =?utf8?q?=E3=81=BE=E3=81=A8=E3=82=81=E3=81=9F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd3.c    | 10 +++++-----
 src/defines.h |  3 +++
 src/xtra1.c   |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/cmd3.c b/src/cmd3.c
index cf23e2996..42e7e3a2a 100644
--- 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 c27baaea8..b85605d73 100644
--- 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 bf33aab2f..c38570342 100644
--- 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]))
-- 
2.11.0