From: deskull <deskull@users.sourceforge.jp>
Date: Mon, 8 Jul 2019 13:57:47 +0000 (+0900)
Subject: [Refactor] #37353 mention_use() を整理．
X-Git-Tag: vmacos3.0.0-alpha52~2949
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2a87b25ca516131e03ca5355a0962b648b0e8ca0;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #37353 mention_use() を整理．
---

diff --git a/src/player-inventory.c b/src/player-inventory.c
index 40c2c1b61..13b9c276d 100644
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -72,6 +72,49 @@ static INVENTORY_IDX label_to_inven(int c)
 	return (i);
 }
 
+
+/*!
+ * @brief 所持/装備オブジェクトIDの部位表現を返す /
+ * Return a string mentioning how a given item is carried
+ * @param i 部位表現を求めるプレイヤーの所持/装備オブジェクトID
+ * @return 部位表現の文字列ポインタ
+ */
+static concptr mention_use(int i)
+{
+	concptr p;
+
+	/* Examine the location */
+	switch (i)
+	{
+#ifdef JP
+	case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "運搬中" : ((p_ptr->ryoute && p_ptr->migite) ? " 両手" : (left_hander ? " 左手" : " 右手")); break;
+#else
+	case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "Just lifting" : (p_ptr->migite ? "Wielding" : "On arm"); break;
+#endif
+
+#ifdef JP
+	case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "運搬中" : ((p_ptr->ryoute && p_ptr->hidarite) ? " 両手" : (left_hander ? " 右手" : " 左手")); break;
+#else
+	case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "Just lifting" : (p_ptr->hidarite ? "Wielding" : "On arm"); break;
+#endif
+
+	case INVEN_BOW:   p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < p_ptr->inventory_list[i].weight / 10) ? _("運搬中", "Just holding") : _("射撃用", "Shooting"); break;
+	case INVEN_RIGHT: p = (left_hander ? _("左手指", "On left hand") : _("右手指", "On right hand")); break;
+	case INVEN_LEFT:  p = (left_hander ? _("右手指", "On right hand") : _("左手指", "On left hand")); break;
+	case INVEN_NECK:  p = _("  首", "Around neck"); break;
+	case INVEN_LITE:  p = _(" 光源", "Light source"); break;
+	case INVEN_BODY:  p = _("  体", "On body"); break;
+	case INVEN_OUTER: p = _("体の上", "About body"); break;
+	case INVEN_HEAD:  p = _("  é ­", "On head"); break;
+	case INVEN_HANDS: p = _("  手", "On hands"); break;
+	case INVEN_FEET:  p = _("  足", "On feet"); break;
+	default:          p = _("ザック", "In pack"); break;
+	}
+
+	/* Return the result */
+	return p;
+}
+
 /*!
  * @brief 装備アイテム一覧を表示する /
  * Choice window "shadow" of the "show_equip()" function
@@ -3423,48 +3466,6 @@ COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode, OBJECT_TYPE_VALUE tval)
 	return target_item_label;
 }
 
-/*!
- * @brief 所持/装備オブジェクトIDの部位表現を返す /
- * Return a string mentioning how a given item is carried
- * @param i 部位表現を求めるプレイヤーの所持/装備オブジェクトID
- * @return 部位表現の文字列ポインタ
- */
-concptr mention_use(int i)
-{
-	concptr p;
-
-	/* Examine the location */
-	switch (i)
-	{
-#ifdef JP
-	case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "運搬中" : ((p_ptr->ryoute && p_ptr->migite) ? " 両手" : (left_hander ? " 左手" : " 右手")); break;
-#else
-	case INVEN_RARM:  p = p_ptr->heavy_wield[0] ? "Just lifting" : (p_ptr->migite ? "Wielding" : "On arm"); break;
-#endif
-
-#ifdef JP
-	case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "運搬中" : ((p_ptr->ryoute && p_ptr->hidarite) ? " 両手" : (left_hander ? " 右手" : " 左手")); break;
-#else
-	case INVEN_LARM:  p = p_ptr->heavy_wield[1] ? "Just lifting" : (p_ptr->hidarite ? "Wielding" : "On arm"); break;
-#endif
-
-	case INVEN_BOW:   p = (adj_str_hold[p_ptr->stat_ind[A_STR]] < p_ptr->inventory_list[i].weight / 10) ? _("運搬中", "Just holding") : _("射撃用", "Shooting"); break;
-	case INVEN_RIGHT: p = (left_hander ? _("左手指", "On left hand") : _("右手指", "On right hand")); break;
-	case INVEN_LEFT:  p = (left_hander ? _("右手指", "On right hand") : _("左手指", "On left hand")); break;
-	case INVEN_NECK:  p = _("  首", "Around neck"); break;
-	case INVEN_LITE:  p = _(" 光源", "Light source"); break;
-	case INVEN_BODY:  p = _("  体", "On body"); break;
-	case INVEN_OUTER: p = _("体の上", "About body"); break;
-	case INVEN_HEAD:  p = _("  é ­", "On head"); break;
-	case INVEN_HANDS: p = _("  手", "On hands"); break;
-	case INVEN_FEET:  p = _("  足", "On feet"); break;
-	default:          p = _("ザック", "In pack"); break;
-	}
-
-	/* Return the result */
-	return p;
-}
-
 
 /*!
  * @brief 所持/装備オブジェクトIDの現在の扱い方の状態表現を返す /
diff --git a/src/player-inventory.h b/src/player-inventory.h
index 1023c3c92..5c86f4b81 100644
--- a/src/player-inventory.h
+++ b/src/player-inventory.h
@@ -4,5 +4,4 @@ extern bool select_ring_slot;
 
 extern bool is_ring_slot(int i);
 extern bool get_item_okay(OBJECT_IDX i);
-extern concptr mention_use(int i);
 extern concptr describe_use(int i);
\ No newline at end of file