From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Sat, 20 Dec 2003 16:30:42 +0000 (+0000)
Subject: まだ両手に指輪が装備されていない状態であっても指輪を装備する手を選択
X-Git-Tag: v2.1.2~709
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d8340f487f0b17aa36fe2a49444c047057bec935;p=hengband%2Fhengband.git

まだ両手に指輪が装備されていない状態であっても指輪を装備する手を選択
できるように変更. 実装にあたってTObandのオクトパスを参考にした.
---

diff --git a/src/cmd3.c b/src/cmd3.c
index 688ebf849..d12c54b39 100644
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -201,6 +201,8 @@ static bool item_tester_hook_melee_weapon(object_type *o_ptr)
 }
 
 
+bool select_ring_slot = FALSE;
+
 /*
  * Wield or wear a single item from the pack or floor
  */
@@ -351,23 +353,40 @@ void do_cmd_wield(void)
 
 	/* Rings */
 	case TV_RING:
+		/* Choose a ring slot */
 		if (inventory[INVEN_LEFT].k_idx && inventory[INVEN_RIGHT].k_idx)
 		{
-			/* Restrict the choices */
-			item_tester_tval = TV_RING;
-			item_tester_no_ryoute = TRUE;
-
-			/* Choose a ring from the equipment only */
 #ifdef JP
 			q = "¤É¤Á¤é¤Î»ØÎؤȼè¤êÂؤ¨¤Þ¤¹¤«?";
-			s = "¤ª¤Ã¤È¡£";
 #else
 			q = "Replace which ring? ";
-			s = "Oops.";
 #endif
+		}
+		else
+		{
+#ifdef JP
+			q = "¤É¤Á¤é¤Î¼ê¤ËÁõÈ÷¤·¤Þ¤¹¤«?";
+#else
+			q = "Equip which hand? ";
+#endif
+		}
 
-			if (!get_item(&slot, q, s, (USE_EQUIP))) return;
+#ifdef JP
+		s = "¤ª¤Ã¤È¡£";
+#else
+		s = "Oops.";
+#endif
+
+		/* Restrict the choices */
+		select_ring_slot = TRUE;
+		item_tester_no_ryoute = TRUE;
+
+		if (!get_item(&slot, q, s, (USE_EQUIP)))
+		{
+			select_ring_slot = FALSE;
+			return;
 		}
+		select_ring_slot = FALSE;
 		break;
 	}
 
diff --git a/src/object1.c b/src/object1.c
index ec2911b9f..f6ffcc0b7 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -3964,6 +3964,16 @@ s16b label_to_inven(int c)
 }
 
 
+/* See cmd5.c */
+extern bool select_ring_slot;
+
+
+static bool is_ring_slot(int i)
+{
+	return (i == INVEN_RIGHT) || (i == INVEN_LEFT);
+}
+
+
 /*
  * Convert a label into the index of a item in the "equip"
  * Return "-1" if the label does not indicate a real item
@@ -3978,6 +3988,8 @@ s16b label_to_equip(int c)
 	/* Verify the index */
 	if ((i < INVEN_RARM) || (i >= INVEN_TOTAL)) return (-1);
 
+	if (select_ring_slot) return is_ring_slot(i) ? i : -1;
+
 	/* Empty slots can never be chosen */
 	if (!inventory[i].k_idx) return (-1);
 
@@ -4436,7 +4448,7 @@ void display_equip(void)
 		tmp_val[0] = tmp_val[1] = tmp_val[2] = ' ';
 
 		/* Is this item "acceptable"? */
-		if (item_tester_okay(o_ptr))
+		if (select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr))
 		{
 			/* Prepare an "index" */
 			tmp_val[0] = index_to_label(i);
@@ -4987,7 +4999,7 @@ int show_equip(int target_item)
 		o_ptr = &inventory[i];
 
 		/* Is this item acceptable? */
-		if (!item_tester_okay(o_ptr) &&
+		if (!(select_ring_slot ? is_ring_slot(i) : item_tester_okay(o_ptr)) &&
 		    (!((((i == INVEN_RARM) && p_ptr->hidarite) || ((i == INVEN_LARM) && p_ptr->migite)) && p_ptr->ryoute) ||
 		     item_tester_no_ryoute)) continue;
 
@@ -5306,6 +5318,8 @@ static bool get_item_okay(int i)
 	/* Illegal items */
 	if ((i < 0) || (i >= INVEN_TOTAL)) return (FALSE);
 
+	if (select_ring_slot) return is_ring_slot(i);
+
 	/* Verify the item */
 	if (!item_tester_okay(&inventory[i])) return (FALSE);
 
@@ -5522,7 +5536,7 @@ bool get_item(int *cp, cptr pmt, cptr str, int mode)
 	else if (use_menu)
 	{
 		for (j = INVEN_RARM; j < INVEN_TOTAL; j++)
-			if (item_tester_okay(&inventory[j])) max_equip++;
+			if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j])) max_equip++;
 		if (p_ptr->ryoute && !item_tester_no_ryoute) max_equip++;
 	}
 
@@ -6557,7 +6571,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 	else if (use_menu)
 	{
 		for (j = INVEN_RARM; j < INVEN_TOTAL; j++)
-			if (item_tester_okay(&inventory[j])) max_equip++;
+			if (select_ring_slot ? is_ring_slot(j) : item_tester_okay(&inventory[j])) max_equip++;
 		if (p_ptr->ryoute && !item_tester_no_ryoute) max_equip++;
 	}