X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd5.c;h=92a0a113e3f5a8806a6e7a76248fe02a725a6b36;hb=eb2f15d1cfc313fda1f0578f2685246f3b76af4d;hp=43273631d7b9a0eae110dad5a635767b03c6a62f;hpb=df8c3bce46b4a0a765cbcc45be90a578fe2f666d;p=hengband%2Fhengband.git

diff --git a/src/cmd5.c b/src/cmd5.c
index 43273631d..92a0a113e 100644
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -22,31 +22,17 @@ cptr spell_category_name(OBJECT_TYPE_VALUE tval)
 {
 	switch (tval)
 	{
-#ifdef JP
-	case TV_HISSATSU_BOOK:
-		return "必殺技";
-	case TV_LIFE_BOOK:
-		return "祈り";
-	case TV_MUSIC_BOOK:
-		return "歌";
-	default:
-		return "呪文";
-#else
 	case TV_HISSATSU_BOOK:
-		return "art";
+		return _("必殺技", "art");
 	case TV_LIFE_BOOK:
-		return "prayer";
+		return _("祈り", "prayer");
 	case TV_MUSIC_BOOK:
-		return "song";
+		return _("歌", "song");
 	default:
-		return "spell";
-#endif
+		return _("呪文", "spell");
 	}
 }
 
-
-bool select_the_force = FALSE;
-
 /*!
  * @brief 領域魔法の閲覧、学習、使用選択するインターフェイス処理
  * Allow user to choose a spell/prayer from the given book.
@@ -64,29 +50,29 @@ bool select_the_force = FALSE;
  * The "known" should be TRUE for cast/pray, FALSE for study
  * </pre>
  */
-static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, int use_realm)
+static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool learned, REALM_IDX use_realm)
 {
 	int         i;
-	int         spell = -1;
+	SPELL_IDX   spell = -1;
 	int         num = 0;
 	int         ask = TRUE;
-	int         need_mana;
-	int         spells[64];
+	MANA_POINT  need_mana;
+	SPELL_IDX   spells[64];
 	bool        flag, redraw, okay;
 	char        choice;
 	const magic_type  *s_ptr;
 	char        out_val[160];
 	cptr        p;
+	COMMAND_CODE code;
 #ifdef JP
 	char jverb_buf[128];
 #endif
 	int menu_line = (use_menu ? 1 : 0);
 
-#ifdef ALLOW_REPEAT /* TNB */
-
 	/* Get the spell, if available */
-	if (repeat_pull(sn))
+	if (repeat_pull(&code))
 	{
+		*sn = (SPELL_IDX)code;
 		/* Verify the spell */
 		if (spell_okay(*sn, learned, FALSE, use_realm))
 		{
@@ -95,8 +81,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 		}
 	}
 
-#endif /* ALLOW_REPEAT -- TNB */
-
 	p = spell_category_name(mp_ptr->spell_book);
 
 	/* Extract spells */
@@ -138,11 +122,8 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 	/* No redraw yet */
 	redraw = FALSE;
 
-	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
-
-	/* Window stuff */
-	window_stuff();
+	handle_stuff();
 
 	/* Build a prompt (accept all spells) */
 #ifdef JP
@@ -213,8 +194,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 				{
 					/* Show list */
 					redraw = TRUE;
-
-					/* Save the screen */
 					screen_save();
 
 					/* Display a list of spells */
@@ -228,8 +207,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 
 					/* Hide list */
 					redraw = FALSE;
-
-					/* Restore the screen */
 					screen_load();
 				}
 
@@ -318,17 +295,10 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 		flag = TRUE;
 	}
 
-
-	/* Restore the screen */
 	if (redraw) screen_load();
 
-
-	/* Show choices */
 	p_ptr->window |= (PW_SPELL);
-
-	/* Window stuff */
-	window_stuff();
-
+	handle_stuff();
 
 	/* Abort if needed */
 	if (!flag) return FALSE;
@@ -336,11 +306,7 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 	/* Save the choice */
 	(*sn) = spell;
 
-#ifdef ALLOW_REPEAT /* TNB */
-
-	repeat_push(*sn);
-
-#endif /* ALLOW_REPEAT -- TNB */
+	repeat_push((COMMAND_CODE)spell);
 
 	/* Success */
 	return TRUE;
@@ -406,20 +372,16 @@ static bool player_has_no_spellbooks(void)
  */
 static void confirm_use_force(bool browse_only)
 {
-	int  item;
 	char which;
-
-#ifdef ALLOW_REPEAT
+	COMMAND_CODE code;
 
 	/* Get the item index */
-	if (repeat_pull(&item) && (item == INVEN_FORCE))
+	if (repeat_pull(&code) && (code == INVEN_FORCE))
 	{
 		browse_only ? do_cmd_mind_browse() : do_cmd_mind();
 		return;
 	}
 
-#endif /* ALLOW_REPEAT */
-
 	/* Show the prompt */
 	prt(_("('w'練気術, ESC) 'w'かESCを押してください。 ", "(w for the Force, ESC) Hit 'w' or ESC. "), 0, 0);
 
@@ -431,13 +393,7 @@ static void confirm_use_force(bool browse_only)
 		if (which == ESCAPE) break;
 		else if (which == 'w')
 		{
-
-#ifdef ALLOW_REPEAT
-
 			repeat_push(INVEN_FORCE);
-
-#endif /* ALLOW_REPEAT */
-
 			break;
 		}
 	}
@@ -466,12 +422,15 @@ static void confirm_use_force(bool browse_only)
  */
 void do_cmd_browse(void)
 {
-	int		item, sval, use_realm = 0, j, line;
-	int		spell = -1;
-	int		num = 0;
+	OBJECT_IDX item;
+	OBJECT_SUBTYPE_VALUE sval;
+	REALM_IDX use_realm = 0;
+	int j, line;
+	SPELL_IDX spell = -1;
+	int num = 0;
 
-	int		spells[64];
-	char    temp[62*4];
+	SPELL_IDX spells[64];
+	char temp[62*4];
 
 	object_type	*o_ptr;
 
@@ -496,42 +455,26 @@ void do_cmd_browse(void)
 			confirm_use_force(TRUE);
 			return;
 		}
-		select_the_force = TRUE;
 	}
 
 	/* Restrict choices to "useful" books */
 	if (p_ptr->realm2 == REALM_NONE) item_tester_tval = mp_ptr->spell_book;
 	else item_tester_hook = item_tester_learn_spell;
 
-	/* Get an item */
 	q = _("どの本を読みますか? ", "Browse which book? ");
 	s = _("読める本がない。", "You have no books that you can read.");
 
-	if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR)))
-	{
-		select_the_force = FALSE;
-		return;
-	}
-	select_the_force = FALSE;
-
-	if (item == INVEN_FORCE) /* the_force */
+	o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR | (p_ptr->pclass == CLASS_FORCETRAINER ? USE_FORCE : 0)));
+	if (!o_ptr)
 	{
-		do_cmd_mind_browse();
+		if (item == INVEN_FORCE) /* the_force */
+		{
+			do_cmd_mind_browse();
+			return;
+		}
 		return;
 	}
 
-	/* Get the item (in the pack) */
-	else if (item >= 0)
-	{
-		o_ptr = &inventory[item];
-	}
-
-	/* Get the item (on the floor) */
-	else
-	{
-		o_ptr = &o_list[0 - item];
-	}
-
 	/* Access the item's sval */
 	sval = o_ptr->sval;
 
@@ -539,11 +482,8 @@ void do_cmd_browse(void)
 
 	/* Track the object kind */
 	object_kind_track(o_ptr->k_idx);
-
-	/* Hack -- Handle stuff */
 	handle_stuff();
 
-
 	/* Extract spells */
 	for (spell = 0; spell < 32; spell++)
 	{
@@ -555,11 +495,7 @@ void do_cmd_browse(void)
 		}
 	}
 
-
-	/* Save the screen */
 	screen_save();
-
-	/* Clear the top line */
 	prt("", 0, 0);
 
 	/* Keep browsing spells.  Exit browsing on cancel. */
@@ -581,8 +517,6 @@ void do_cmd_browse(void)
 				prt(_("読める呪文がない。", "No spells to browse."), 0, 0);
 			(void)inkey();
 
-
-			/* Restore the screen */
 			screen_load();
 
 			return;
@@ -602,8 +536,6 @@ void do_cmd_browse(void)
 			line++;
 		}
 	}
-
-	/* Restore the screen */
 	screen_load();
 }
 
@@ -654,7 +586,8 @@ static void change_realm2(CHARACTER_IDX next_realm)
  */
 void do_cmd_study(void)
 {
-	int	i, item;
+	int	i;
+	OBJECT_IDX item;
 	OBJECT_SUBTYPE_VALUE sval;
 	int	increment = 0;
 	bool    learned = FALSE;
@@ -715,23 +648,11 @@ void do_cmd_study(void)
 	if (p_ptr->realm2 == REALM_NONE) item_tester_tval = mp_ptr->spell_book;
 	else item_tester_hook = item_tester_learn_spell;
 
-	/* Get an item */
 	q = _("どの本から学びますか? ", "Study which book? ");
 	s = _("読める本がない。", "You have no books that you can read.");
 
-	if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-	/* Get the item (in the pack) */
-	if (item >= 0)
-	{
-		o_ptr = &inventory[item];
-	}
-
-	/* Get the item (on the floor) */
-	else
-	{
-		o_ptr = &o_list[0 - item];
-	}
+	o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR));
+	if (!o_ptr) return;
 
 	/* Access the item's sval */
 	sval = o_ptr->sval;
@@ -746,29 +667,19 @@ void do_cmd_study(void)
 
 	/* Track the object kind */
 	object_kind_track(o_ptr->k_idx);
-
-	/* Hack -- Handle stuff */
 	handle_stuff();
 
 	/* Mage -- Learn a selected spell */
 	if (mp_ptr->spell_book != TV_LIFE_BOOK)
 	{
 		/* Ask for a spell, allow cancel */
-#ifdef JP
-		if (!get_spell(&spell, "学ぶ", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1)
-			&& (spell == -1)) return;
-#else
-		if (!get_spell(&spell, "study", sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1)
-			&& (spell == -1)) return;
-#endif
-
+		if (!get_spell(&spell, _("学ぶ", "study"), sval, FALSE, o_ptr->tval - TV_LIFE_BOOK + 1) && (spell == -1)) return;
 	}
 
 	/* Priest -- Learn a random prayer */
 	else
 	{
 		int k = 0;
-
 		int gift = -1;
 
 		/* Extract spells */
@@ -796,14 +707,12 @@ void do_cmd_study(void)
 	/* Nothing to study */
 	if (spell < 0)
 	{
-		/* Message */
 		msg_format(_("その本には学ぶべき%sがない。", "You cannot learn any %ss in that book."), p);
 
 		/* Abort */
 		return;
 	}
 
-
 	if (increment) spell += increment;
 
 	/* Learn the spell */
@@ -892,7 +801,6 @@ void do_cmd_study(void)
 #endif
 	}
 
-	/* Take a turn */
 	p_ptr->energy_use = 100;
 
 	switch (mp_ptr->spell_book)
@@ -911,139 +819,19 @@ void do_cmd_study(void)
 		break;
 	}
 
-	/* Sound */
 	sound(SOUND_STUDY);
 
 	/* One less spell available */
 	p_ptr->learned_spells++;
-#if 0
-	/* Message if needed */
-	if (p_ptr->new_spells)
-	{
-		/* Message */
-#ifdef JP
-		if (p_ptr->new_spells < 10) msg_format("あと %d つの%sを学べる。", p_ptr->new_spells, p);
-		else msg_format("あと %d 個の%sを学べる。", p_ptr->new_spells, p);
-#else
-		msg_format("You can learn %d more %s%s.", p_ptr->new_spells, p,
-		           (p_ptr->new_spells != 1) ? "s" : "");
-#endif
-	}
-#endif
-
+#
 	/* Update Study */
 	p_ptr->update |= (PU_SPELLS);
-	update_stuff();
+	handle_stuff();
 
 	/* Redraw object recall */
 	p_ptr->window |= (PW_OBJECT);
 }
 
-/*!
- * @brief 運命の輪、並びにカオス的な効果の発動
- * @param spell ランダムな効果を選択するための基準ID
- * @return なし
- */
-static void wild_magic(int spell)
-{
-	int counter = 0;
-	int type = SUMMON_MOLD + randint0(6);
-
-	if (type < SUMMON_MOLD) type = SUMMON_MOLD;
-	else if (type > SUMMON_MIMIC) type = SUMMON_MIMIC;
-
-	switch (randint1(spell) + randint1(8) + 1)
-	{
-	case 1:
-	case 2:
-	case 3:
-		teleport_player(10, TELEPORT_PASSIVE);
-		break;
-	case 4:
-	case 5:
-	case 6:
-		teleport_player(100, TELEPORT_PASSIVE);
-		break;
-	case 7:
-	case 8:
-		teleport_player(200, TELEPORT_PASSIVE);
-		break;
-	case 9:
-	case 10:
-	case 11:
-		unlite_area(10, 3);
-		break;
-	case 12:
-	case 13:
-	case 14:
-		lite_area(damroll(2, 3), 2);
-		break;
-	case 15:
-		destroy_doors_touch();
-		break;
-	case 16: case 17:
-		wall_breaker();
-	case 18:
-		sleep_monsters_touch();
-		break;
-	case 19:
-	case 20:
-		trap_creation(p_ptr->y, p_ptr->x);
-		break;
-	case 21:
-	case 22:
-		door_creation();
-		break;
-	case 23:
-	case 24:
-	case 25:
-		aggravate_monsters(0);
-		break;
-	case 26:
-		earthquake(p_ptr->y, p_ptr->x, 5);
-		break;
-	case 27:
-	case 28:
-		(void)gain_random_mutation(0);
-		break;
-	case 29:
-	case 30:
-		apply_disenchant(1);
-		break;
-	case 31:
-		lose_all_info();
-		break;
-	case 32:
-		fire_ball(GF_CHAOS, 0, spell + 5, 1 + (spell / 10));
-		break;
-	case 33:
-		wall_stone();
-		break;
-	case 34:
-	case 35:
-		while (counter++ < 8)
-		{
-			(void)summon_specific(0, p_ptr->y, p_ptr->x, (dun_level * 3) / 2, type, (PM_ALLOW_GROUP | PM_NO_PET));
-		}
-		break;
-	case 36:
-	case 37:
-		activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
-		break;
-	case 38:
-		(void)summon_cyber(-1, p_ptr->y, p_ptr->x);
-		break;
-	default:
-		{
-			int count = 0;
-			(void)activate_ty_curse(FALSE, &count);
-			break;
-		}
-	}
-
-	return;
-}
-
 
 /*!
  * @brief 魔法を詠唱するコマンドのメインルーチン /
@@ -1052,20 +840,18 @@ static void wild_magic(int spell)
  */
 void do_cmd_cast(void)
 {
-	int	item;
+	OBJECT_IDX item;
 	OBJECT_SUBTYPE_VALUE sval;
-	int spell, realm;
+	SPELL_IDX spell;
+	REALM_IDX realm;
 	int	chance;
 	int	increment = 0;
-	int	use_realm;
-	int	need_mana;
+	REALM_IDX use_realm;
+	MANA_POINT need_mana;
 
 	cptr prayer;
-
 	object_type	*o_ptr;
-
 	const magic_type *s_ptr;
-
 	cptr q, s;
 
 	bool over_exerted = FALSE;
@@ -1117,7 +903,6 @@ void do_cmd_cast(void)
 			confirm_use_force(FALSE);
 			return;
 		}
-		select_the_force = TRUE;
 	}
 
 	prayer = spell_category_name(mp_ptr->spell_book);
@@ -1125,45 +910,27 @@ void do_cmd_cast(void)
 	/* Restrict choices to spell books */
 	item_tester_tval = mp_ptr->spell_book;
 
-	/* Get an item */
 	q = _("どの呪文書を使いますか? ", "Use which book? ");
 	s = _("呪文書がない！", "You have no spell books!");
 
-	if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR)))
-	{
-		select_the_force = FALSE;
-		return;
-	}
-	select_the_force = FALSE;
-
-	if (item == INVEN_FORCE) /* the_force */
+	o_ptr = choose_object(&item, q, s, (USE_INVEN | USE_FLOOR | (p_ptr->pclass == CLASS_FORCETRAINER ? USE_FORCE : 0)));
+	if (!o_ptr)
 	{
-		do_cmd_mind();
+		if (item == INVEN_FORCE) /* the_force */
+		{
+			do_cmd_mind();
+			return;
+		}
 		return;
 	}
 
-	/* Get the item (in the pack) */
-	else if (item >= 0)
-	{
-		o_ptr = &inventory[item];
-	}
-
-	/* Get the item (on the floor) */
-	else
-	{
-		o_ptr = &o_list[0 - item];
-	}
-
 	/* Access the item's sval */
 	sval = o_ptr->sval;
 
 	if ((p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_RED_MAGE) && (o_ptr->tval == REALM2_BOOK)) increment = 32;
 
-
 	/* Track the object kind */
 	object_kind_track(o_ptr->k_idx);
-
-	/* Hack -- Handle stuff */
 	handle_stuff();
 
 	if ((p_ptr->pclass == CLASS_SORCERER) || (p_ptr->pclass == CLASS_RED_MAGE))
@@ -1173,9 +940,8 @@ void do_cmd_cast(void)
 
 	/* Ask for a spell */
 #ifdef JP
-	if (!get_spell(&spell,  
-				((mp_ptr->spell_book == TV_LIFE_BOOK) ? "詠唱する" : (mp_ptr->spell_book == TV_MUSIC_BOOK) ? "歌う" : "唱える"), 
-		       sval, TRUE, realm))
+	if (!get_spell(&spell, ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "詠唱する" : (mp_ptr->spell_book == TV_MUSIC_BOOK) ? "歌う" : "唱える"), 
+			sval, TRUE, realm))
 	{
 		if (spell == -2) msg_format("その本には知っている%sがない。", prayer);
 		return;
@@ -1222,8 +988,8 @@ void do_cmd_cast(void)
 
 		/* Warning */
 #ifdef JP
-msg_format("その%sを%sのに十分なマジックポイントがない。",prayer,
- ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "詠唱する" : (mp_ptr->spell_book == TV_LIFE_BOOK) ? "歌う" : "唱える"));
+		msg_format("その%sを%sのに十分なマジックポイントがない。",prayer,
+			 ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "詠唱する" : (mp_ptr->spell_book == TV_LIFE_BOOK) ? "歌う" : "唱える"));
 #else
 		msg_format("You do not have enough mana to %s this %s.",
 			((mp_ptr->spell_book == TV_LIFE_BOOK) ? "recite" : "cast"),
@@ -1247,8 +1013,6 @@ msg_format("その%sを%sのに十分なマジックポイントがない。",pr
 		p_ptr->csp -= need_mana;
 	}
 	else over_exerted = TRUE;
-
-	/* Redraw mana */
 	p_ptr->redraw |= (PR_MANA);
 
 	/* Failed spell */
@@ -1455,7 +1219,6 @@ msg_format("その%sを%sのに十分なマジックポイントがない。",pr
 		}
 	}
 
-	/* Take a turn */
 	p_ptr->energy_use = 100;
 
 
@@ -1468,7 +1231,6 @@ msg_format("その%sを%sのに十分なマジックポイントがない。",pr
 		p_ptr->csp = 0;
 		p_ptr->csp_frac = 0;
 
-		/* Message */
 		msg_print(_("精神を集中しすぎて気を失ってしまった！", "You faint from the effort!"));
 
 		/* Hack -- Bypass free action */
@@ -1504,7 +1266,6 @@ msg_format("その%sを%sのに十分なマジックポイントがない。",pr
 		{
 			bool perm = (randint0(100) < 25);
 
-			/* Message */
 			msg_print(_("体を悪くしてしまった！", "You have damaged your health!"));
 
 			/* Reduce constitution */
@@ -1512,1201 +1273,6 @@ msg_format("その%sを%sのに十分なマジックポイントがない。",pr
 		}
 	}
 
-	/* Window stuff */
 	p_ptr->window |= (PW_PLAYER);
 	p_ptr->window |= (PW_SPELL);
 }
-
-/*!
- * @brief ペットになっているモンスターをソートするための比較処理
- * @param u モンスターの構造体配列
- * @param v 未使用
- * @param a 比較対象のモンスターID1
- * @param b 比較対象のモンスターID2
- * @return 2番目が大ならばTRUEを返す
- */
-static bool ang_sort_comp_pet_dismiss(vptr u, vptr v, int a, int b)
-{
-	u16b *who = (u16b*)(u);
-
-	int w1 = who[a];
-	int w2 = who[b];
-
-	monster_type *m_ptr1 = &m_list[w1];
-	monster_type *m_ptr2 = &m_list[w2];
-	monster_race *r_ptr1 = &r_info[m_ptr1->r_idx];
-	monster_race *r_ptr2 = &r_info[m_ptr2->r_idx];
-
-	/* Unused */
-	(void)v;
-
-	if (w1 == p_ptr->riding) return TRUE;
-	if (w2 == p_ptr->riding) return FALSE;
-
-	if (m_ptr1->nickname && !m_ptr2->nickname) return TRUE;
-	if (m_ptr2->nickname && !m_ptr1->nickname) return FALSE;
-
-	if (!m_ptr1->parent_m_idx && m_ptr2->parent_m_idx) return TRUE;
-	if (!m_ptr2->parent_m_idx && m_ptr1->parent_m_idx) return FALSE;
-
-	if ((r_ptr1->flags1 & RF1_UNIQUE) && !(r_ptr2->flags1 & RF1_UNIQUE)) return TRUE;
-	if ((r_ptr2->flags1 & RF1_UNIQUE) && !(r_ptr1->flags1 & RF1_UNIQUE)) return FALSE;
-
-	if (r_ptr1->level > r_ptr2->level) return TRUE;
-	if (r_ptr2->level > r_ptr1->level) return FALSE;
-
-	if (m_ptr1->hp > m_ptr2->hp) return TRUE;
-	if (m_ptr2->hp > m_ptr1->hp) return FALSE;
-	
-	return w1 <= w2;
-}
-
-/*!
- * @brief ペットの善悪属性に応じた維持コストの途中計算処理
- * @param m_ptr 計算基準となるモンスターの構造体参照ポインタ
- * @param inc m_ptrで指定したモンスターを維持コスト計算に加えるならTRUE、外すならFALSEを指定
- * @return なし
- */
-void check_pets_num_and_align(monster_type *m_ptr, bool inc)
-{
-	s32b old_friend_align = friend_align;
-	monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
-	if (inc)
-	{
-		total_friends++;
-		if (r_ptr->flags3 & RF3_GOOD) friend_align += r_ptr->level;
-		if (r_ptr->flags3 & RF3_EVIL) friend_align -= r_ptr->level;
-	}
-	else
-	{
-		total_friends--;
-		if (r_ptr->flags3 & RF3_GOOD) friend_align -= r_ptr->level;
-		if (r_ptr->flags3 & RF3_EVIL) friend_align += r_ptr->level;
-	}
-
-	if (old_friend_align != friend_align) p_ptr->update |= (PU_BONUS);
-}
-
-/*!
- * @brief ペットの維持コスト計算
- * @return 維持コスト(%)
- */
-int calculate_upkeep(void)
-{
-	s32b old_friend_align = friend_align;
-	int m_idx;
-	bool have_a_unique = FALSE;
-	s32b total_friend_levels = 0;
-
-	total_friends = 0;
-	friend_align = 0;
-
-	for (m_idx = m_max - 1; m_idx >=1; m_idx--)
-	{
-		monster_type *m_ptr;
-		monster_race *r_ptr;
-		
-		m_ptr = &m_list[m_idx];
-		if (!m_ptr->r_idx) continue;
-		r_ptr = &r_info[m_ptr->r_idx];
-
-		if (is_pet(m_ptr))
-		{
-			total_friends++;
-			if (r_ptr->flags1 & RF1_UNIQUE)
-			{
-				if (p_ptr->pclass == CLASS_CAVALRY)
-				{
-					if (p_ptr->riding == m_idx)
-						total_friend_levels += (r_ptr->level+5)*2;
-					else if (!have_a_unique && (r_info[m_ptr->r_idx].flags7 & RF7_RIDING))
-						total_friend_levels += (r_ptr->level+5)*7/2;
-					else
-						total_friend_levels += (r_ptr->level+5)*10;
-					have_a_unique = TRUE;
-				}
-				else
-					total_friend_levels += (r_ptr->level+5)*10;
-			}
-			else
-				total_friend_levels += r_ptr->level;
-
-			/* Determine pet alignment */
-			if (r_ptr->flags3 & RF3_GOOD) friend_align += r_ptr->level;
-			if (r_ptr->flags3 & RF3_EVIL) friend_align -= r_ptr->level;
-		}
-	}
-	if (old_friend_align != friend_align) p_ptr->update |= (PU_BONUS);
-	if (total_friends)
-	{
-		int upkeep_factor;
-		upkeep_factor = (total_friend_levels - (p_ptr->lev * 80 / (cp_ptr->pet_upkeep_div)));
-		if (upkeep_factor < 0) upkeep_factor = 0;
-		if (upkeep_factor > 1000) upkeep_factor = 1000;
-		return upkeep_factor;
-	}
-	else
-		return 0;
-}
-
-/*!
- * @brief ペットを開放するコマンドのメインルーチン
- * @return なし
- */
-void do_cmd_pet_dismiss(void)
-{
-	monster_type	*m_ptr;
-	bool		all_pets = FALSE;
-	IDX pet_ctr;
-	int i;
-	int Dismissed = 0;
-
-	u16b *who;
-	u16b dummy_why;
-	int max_pet = 0;
-	int cu, cv;
-
-	cu = Term->scr->cu;
-	cv = Term->scr->cv;
-	Term->scr->cu = 0;
-	Term->scr->cv = 1;
-
-	/* Allocate the "who" array */
-	C_MAKE(who, max_m_idx, u16b);
-
-	/* Process the monsters (backwards) */
-	for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)
-	{
-		if (is_pet(&m_list[pet_ctr]))
-			who[max_pet++] = pet_ctr;
-	}
-
-	/* Select the sort method */
-	ang_sort_comp = ang_sort_comp_pet_dismiss;
-	ang_sort_swap = ang_sort_swap_hook;
-
-	ang_sort(who, &dummy_why, max_pet);
-
-	/* Process the monsters (backwards) */
-	for (i = 0; i < max_pet; i++)
-	{
-		bool delete_this;
-		char friend_name[80];
-		bool kakunin;
-
-		/* Access the monster */
-		pet_ctr = who[i];
-		m_ptr = &m_list[pet_ctr];
-
-		delete_this = FALSE;
-		kakunin = ((pet_ctr == p_ptr->riding) || (m_ptr->nickname));
-		monster_desc(friend_name, m_ptr, MD_ASSUME_VISIBLE);
-
-		if (!all_pets)
-		{
-			/* Hack -- health bar for this monster */
-			health_track(pet_ctr);
-
-			/* Hack -- handle stuff */
-			handle_stuff();
-			
-			msg_format(_("%sを放しますか？ [Yes/No/Unnamed (%d体)]","Dismiss %s? [Yes/No/Unnamed (%d remain)]"), friend_name, max_pet - i);
-			
-			if (m_ptr->ml)
-				move_cursor_relative(m_ptr->fy, m_ptr->fx);
-
-			while (TRUE)
-			{
-				char ch = inkey();
-
-				if (ch == 'Y' || ch == 'y')
-				{
-					delete_this = TRUE;
-
-					if (kakunin)
-					{
-						msg_format(_("本当によろしいですか？ (%s) ","Are you sure? (%s) "), friend_name);
-						ch = inkey();
-						if (ch != 'Y' && ch != 'y')
-							delete_this = FALSE;
-					}
-					break;
-				}
-
-				if (ch == 'U' || ch == 'u')
-				{
-					all_pets = TRUE;
-					break;
-				}
-
-				if (ch == ESCAPE || ch == 'N' || ch == 'n')
-					break;
-
-				bell();
-			}
-		}
-
-		if ((all_pets && !kakunin) || (!all_pets && delete_this))
-		{
-			if (record_named_pet && m_ptr->nickname)
-			{
-				char m_name[80];
-
-				monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-				do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
-			}
-
-			if (pet_ctr == p_ptr->riding)
-			{
-				msg_format(_("%sから降りた。","You have got off %s. "), friend_name);
-
-				p_ptr->riding = 0;
-
-				/* Update the monsters */
-				p_ptr->update |= (PU_BONUS | PU_MONSTERS);
-				p_ptr->redraw |= (PR_EXTRA | PR_UHEALTH);
-			}
-
-			/* HACK : Add the line to message buffer */
-			msg_format(_("%s を放した。","Dismissed %s."), friend_name);
-			p_ptr->window |= (PW_MESSAGE);
-			window_stuff();
-
-			delete_monster_idx(pet_ctr);
-			Dismissed++;
-		}
-	}
-
-	Term->scr->cu = cu;
-	Term->scr->cv = cv;
-	Term_fresh();
-
-	C_KILL(who, max_m_idx, u16b);
-
-#ifdef JP
-	msg_format("%d 体のペットを放しました。", Dismissed);
-#else
-	msg_format("You have dismissed %d pet%s.", Dismissed,
-		   (Dismissed == 1 ? "" : "s"));
-#endif
-	if (Dismissed == 0 && all_pets)
-		msg_print(_("'U'nnamed は、乗馬以外の名前のないペットだけを全て解放します。", "'U'nnamed means all your pets except named pets and your mount."));
-}
-
-/*!
- * @brief プレイヤーの騎乗/下馬処理判定
- * @param c_ptr プレイヤーの移動先マスの構造体参照ポインタ
- * @param now_riding TRUEなら下馬処理、FALSEならば騎乗処理
- * @return 可能ならばTRUEを返す
- */
-static bool player_can_ride_aux(cave_type *c_ptr, bool now_riding)
-{
-	bool p_can_enter;
-	bool old_character_xtra = character_xtra;
-	int  old_riding = p_ptr->riding;
-	bool old_riding_ryoute = p_ptr->riding_ryoute;
-	bool old_old_riding_ryoute = p_ptr->old_riding_ryoute;
-	bool old_pf_ryoute = (p_ptr->pet_extra_flags & PF_RYOUTE) ? TRUE : FALSE;
-
-	/* Hack -- prevent "icky" message */
-	character_xtra = TRUE;
-
-	if (now_riding) p_ptr->riding = c_ptr->m_idx;
-	else
-	{
-		p_ptr->riding = 0;
-		p_ptr->pet_extra_flags &= ~(PF_RYOUTE);
-		p_ptr->riding_ryoute = p_ptr->old_riding_ryoute = FALSE;
-	}
-
-	calc_bonuses();
-
-	p_can_enter = player_can_enter(c_ptr->feat, CEM_P_CAN_ENTER_PATTERN);
-
-	p_ptr->riding = old_riding;
-	if (old_pf_ryoute) p_ptr->pet_extra_flags |= (PF_RYOUTE);
-	else p_ptr->pet_extra_flags &= ~(PF_RYOUTE);
-	p_ptr->riding_ryoute = old_riding_ryoute;
-	p_ptr->old_riding_ryoute = old_old_riding_ryoute;
-
-	calc_bonuses();
-
-	character_xtra = old_character_xtra;
-
-	return p_can_enter;
-}
-
-/*!
- * @brief プレイヤーの落馬判定処理
- * @param dam 落馬判定を発した際に受けたダメージ量
- * @param force TRUEならば強制的に落馬する
- * @return 実際に落馬したらTRUEを返す
- */
-bool rakuba(int dam, bool force)
-{
-	int i, y, x, oy, ox;
-	int sn = 0, sy = 0, sx = 0;
-	char m_name[80];
-	monster_type *m_ptr = &m_list[p_ptr->riding];
-	monster_race *r_ptr = &r_info[m_ptr->r_idx];
-	bool fall_dam = FALSE;
-
-	if (!p_ptr->riding) return FALSE;
-	if (p_ptr->wild_mode) return FALSE;
-
-	if (dam >= 0 || force)
-	{
-		if (!force)
-		{
-			int cur = p_ptr->skill_exp[GINOU_RIDING];
-			int max = s_info[p_ptr->pclass].s_max[GINOU_RIDING];
-			int ridinglevel = r_ptr->level;
-
-			/* 落馬のしやすさ */
-			int rakubalevel = r_ptr->level;
-			if (p_ptr->riding_ryoute) rakubalevel += 20;
-
-			if ((cur < max) && (max > 1000) &&
-			    (dam / 2 + ridinglevel) > (cur / 30 + 10))
-			{
-				int inc = 0;
-
-				if (ridinglevel > (cur / 100 + 15))
-					inc += 1 + (ridinglevel - cur / 100 - 15);
-				else
-					inc += 1;
-
-				p_ptr->skill_exp[GINOU_RIDING] = MIN(max, cur + inc);
-			}
-
-			/* レベルの低い乗馬からは落馬しにくい */
-			if (randint0(dam / 2 + rakubalevel * 2) < cur / 30 + 10)
-			{
-				if ((((p_ptr->pclass == CLASS_BEASTMASTER) || (p_ptr->pclass == CLASS_CAVALRY)) && !p_ptr->riding_ryoute) || !one_in_(p_ptr->lev*(p_ptr->riding_ryoute ? 2 : 3) + 30))
-				{
-					return FALSE;
-				}
-			}
-		}
-
-		/* Check around the player */
-		for (i = 0; i < 8; i++)
-		{
-			cave_type *c_ptr;
-
-			/* Access the location */
-			y = p_ptr->y + ddy_ddd[i];
-			x = p_ptr->x + ddx_ddd[i];
-
-			c_ptr = &cave[y][x];
-
-			if (c_ptr->m_idx) continue;
-
-			/* Skip non-empty grids */
-			if (!cave_have_flag_grid(c_ptr, FF_MOVE) && !cave_have_flag_grid(c_ptr, FF_CAN_FLY))
-			{
-				if (!player_can_ride_aux(c_ptr, FALSE)) continue;
-			}
-
-			if (cave_have_flag_grid(c_ptr, FF_PATTERN)) continue;
-
-			/* Count "safe" grids */
-			sn++;
-
-			/* Randomize choice */
-			if (randint0(sn) > 0) continue;
-
-			/* Save the safe location */
-			sy = y; sx = x;
-		}
-		if (!sn)
-		{
-			monster_desc(m_name, m_ptr, 0);
-#ifdef JP
-msg_format("%sから振り落とされそうになって、壁にぶつかった。",m_name);
-			take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, "壁への衝突", -1);
-#else
-			msg_format("You have nearly fallen from %s, but bumped into wall.",m_name);
-			take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, "bumping into wall", -1);
-#endif
-			return FALSE;
-		}
-
-		oy = p_ptr->y;
-		ox = p_ptr->x;
-
-		p_ptr->y = sy;
-		p_ptr->x = sx;
-
-		/* Redraw the old spot */
-		lite_spot(oy, ox);
-
-		/* Redraw the new spot */
-		lite_spot(p_ptr->y, p_ptr->x);
-
-		/* Check for new panel */
-		verify_panel();
-	}
-
-	p_ptr->riding = 0;
-	p_ptr->pet_extra_flags &= ~(PF_RYOUTE);
-	p_ptr->riding_ryoute = p_ptr->old_riding_ryoute = FALSE;
-
-	calc_bonuses();
-
-	p_ptr->update |= (PU_BONUS);
-
-	/* Update stuff */
-	p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);
-
-	/* Window stuff */
-	p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
-	p_ptr->redraw |= (PR_EXTRA);
-
-	/* Update health track of mount */
-	p_ptr->redraw |= (PR_UHEALTH);
-
-	if (p_ptr->levitation && !force)
-	{
-		monster_desc(m_name, m_ptr, 0);
-		msg_format(_("%sから落ちたが、空中でうまく体勢を立て直して着地した。", "You are thrown from %s, but make a good landing."),m_name);
-	}
-	else
-	{
-		take_hit(DAMAGE_NOESCAPE, r_ptr->level+3, _("落馬", "Falling from riding"), -1);
-		fall_dam = TRUE;
-	}
-
-	/* Move the player */
-	if (sy && !p_ptr->is_dead)
-		(void)move_player_effect(p_ptr->y, p_ptr->x, MPE_DONT_PICKUP | MPE_DONT_SWAP_MON);
-
-	return fall_dam;
-}
-
-/*!
- * @brief ペットから騎乗/下馬するコマンドのメインルーチン /
- * @param force 強制的に騎乗/下馬するならばTRUE
- * @return 騎乗/下馬できたらTRUE
- */
-bool do_riding(bool force)
-{
-	int x, y, dir = 0;
-	cave_type *c_ptr;
-	monster_type *m_ptr;
-
-	if (!get_rep_dir2(&dir)) return FALSE;
-	y = p_ptr->y + ddy[dir];
-	x = p_ptr->x + ddx[dir];
-	c_ptr = &cave[y][x];
-
-	if (p_ptr->special_defense & KATA_MUSOU) set_action(ACTION_NONE);
-
-	if (p_ptr->riding)
-	{
-		/* Skip non-empty grids */
-		if (!player_can_ride_aux(c_ptr, FALSE))
-		{
-			msg_print(_("そちらには降りられません。", "You cannot go to that direction."));
-			return FALSE;
-		}
-
-		if (!pattern_seq(p_ptr->y, p_ptr->x, y, x)) return FALSE;
-
-		if (c_ptr->m_idx)
-		{
-			/* Take a turn */
-			p_ptr->energy_use = 100;
-
-			/* Message */
-			msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
-
-			py_attack(y, x, 0);
-			return FALSE;
-		}
-
-		p_ptr->riding = 0;
-		p_ptr->pet_extra_flags &= ~(PF_RYOUTE);
-		p_ptr->riding_ryoute = p_ptr->old_riding_ryoute = FALSE;
-	}
-	else
-	{
-		if (p_ptr->confused)
-		{
-			msg_print(_("混乱していて乗れない！", "You are too confused!"));
-			return FALSE;
-		}
-
-		m_ptr = &m_list[c_ptr->m_idx];
-
-		if (!c_ptr->m_idx || !m_ptr->ml)
-		{
-			msg_print(_("その場所にはモンスターはいません。", "Here is no monster."));
-			return FALSE;
-		}
-		if (!is_pet(m_ptr) && !force)
-		{
-			msg_print(_("そのモンスターはペットではありません。", "That monster is not a pet."));
-			return FALSE;
-		}
-		if (!(r_info[m_ptr->r_idx].flags7 & RF7_RIDING))
-		{
-			msg_print(_("そのモンスターには乗れなさそうだ。", "This monster doesn't seem suitable for riding."));
-			return FALSE;
-		}
-
-		if (!pattern_seq(p_ptr->y, p_ptr->x, y, x)) return FALSE;
-
-		if (!player_can_ride_aux(c_ptr, TRUE))
-		{
-			/* Feature code (applying "mimic" field) */
-			feature_type *f_ptr = &f_info[get_feat_mimic(c_ptr)];
-#ifdef JP
-			msg_format("そのモンスターは%sの%sにいる。", f_name + f_ptr->name,
-			           ((!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY)) ||
-			            (!have_flag(f_ptr->flags, FF_LOS) && !have_flag(f_ptr->flags, FF_TREE))) ?
-			           "中" : "上");
-#else
-			msg_format("This monster is %s the %s.",
-			           ((!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY)) ||
-			            (!have_flag(f_ptr->flags, FF_LOS) && !have_flag(f_ptr->flags, FF_TREE))) ?
-			           "in" : "on", f_name + f_ptr->name);
-#endif
-
-			return FALSE;
-		}
-		if (r_info[m_ptr->r_idx].level > randint1((p_ptr->skill_exp[GINOU_RIDING] / 50 + p_ptr->lev / 2 + 20)))
-		{
-			msg_print(_("うまく乗れなかった。", "You failed to ride."));
-			p_ptr->energy_use = 100;
-			return FALSE;
-		}
-
-		if (MON_CSLEEP(m_ptr))
-		{
-			char m_name[80];
-			monster_desc(m_name, m_ptr, 0);
-			(void)set_monster_csleep(c_ptr->m_idx, 0);
-			msg_format(_("%sを起こした。", "You have waked %s up."), m_name);
-		}
-
-		if (p_ptr->action == ACTION_KAMAE) set_action(ACTION_NONE);
-
-		p_ptr->riding = c_ptr->m_idx;
-
-		/* Hack -- remove tracked monster */
-		if (p_ptr->riding == p_ptr->health_who) health_track(0);
-	}
-
-	p_ptr->energy_use = 100;
-
-	/* Mega-Hack -- Forget the view and lite */
-	p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
-
-	/* Update the monsters */
-	p_ptr->update |= (PU_BONUS);
-
-	/* Redraw map */
-	p_ptr->redraw |= (PR_MAP | PR_EXTRA);
-
-	p_ptr->redraw |= (PR_UHEALTH);
-
-	/* Move the player */
-	(void)move_player_effect(y, x, MPE_HANDLE_STUFF | MPE_ENERGY_USE | MPE_DONT_PICKUP | MPE_DONT_SWAP_MON);
-
-	return TRUE;
-}
-
-/*!
- * @brief ペットに名前をつけるコマンドのメインルーチン
- * @return なし
- */
-static void do_name_pet(void)
-{
-	monster_type *m_ptr;
-	char out_val[20];
-	char m_name[80];
-	bool old_name = FALSE;
-	bool old_target_pet = target_pet;
-
-	target_pet = TRUE;
-	if (!target_set(TARGET_KILL))
-	{
-		target_pet = old_target_pet;
-		return;
-	}
-	target_pet = old_target_pet;
-
-	if (cave[target_row][target_col].m_idx)
-	{
-		m_ptr = &m_list[cave[target_row][target_col].m_idx];
-
-		if (!is_pet(m_ptr))
-		{
-			/* Message */
-			msg_print(_("そのモンスターはペットではない。", "This monster is not a pet."));
-			return;
-		}
-		if (r_info[m_ptr->r_idx].flags1 & RF1_UNIQUE)
-		{
-			msg_print(_("そのモンスターの名前は変えられない！", "You cannot change name of this monster!"));
-			return;
-		}
-		monster_desc(m_name, m_ptr, 0);
-
-		/* Message */
-		msg_format(_("%sに名前をつける。", "Name %s."), m_name);
-		msg_print(NULL);
-
-		/* Start with nothing */
-		strcpy(out_val, "");
-
-		/* Use old inscription */
-		if (m_ptr->nickname)
-		{
-			/* Start with the old inscription */
-			strcpy(out_val, quark_str(m_ptr->nickname));
-			old_name = TRUE;
-		}
-
-		/* Get a new inscription (possibly empty) */
-		if (get_string(_("名前: ", "Name: "), out_val, 15))
-		{
-			if (out_val[0])
-			{
-				/* Save the inscription */
-				m_ptr->nickname = quark_add(out_val);
-				if (record_named_pet)
-				{
-					monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-					do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name);
-				}
-			}
-			else
-			{
-				if (record_named_pet && old_name)
-				{
-					monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
-					do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name);
-				}
-				m_ptr->nickname = 0;
-			}
-		}
-	}
-}
-
-
-/*!
- * @brief ペットに関するコマンドリストのメインルーチン /
- * Issue a pet command
- * @return なし
- */
-void do_cmd_pet(void)
-{
-	int			i = 0;
-	int			num;
-	int			powers[36];
-	cptr			power_desc[36];
-	bool			flag, redraw;
-	char			choice;
-	char			out_val[160];
-	int			pet_ctr;
-	monster_type	*m_ptr;
-
-	int mode = 0;
-
-	char buf[160];
-	char target_buf[160];
-
-	int menu_line = use_menu ? 1 : 0;
-
-	num = 0;
-
-	power_desc[num] = _("ペットを放す", "dismiss pets");
-	powers[num++] = PET_DISMISS;
-
-#ifdef JP
-	sprintf(target_buf, "ペットのターゲットを指定 (現在：%s)",
-		(pet_t_m_idx ? (p_ptr->image ? "何か奇妙な物" : (r_name + r_info[m_list[pet_t_m_idx].ap_r_idx].name)) : "指定なし"));
-#else
-	sprintf(target_buf, "specify a target of pet (now:%s)",
-		(pet_t_m_idx ? (p_ptr->image ? "something strange" : (r_name + r_info[m_list[pet_t_m_idx].ap_r_idx].name)) : "nothing"));
-#endif
-	power_desc[num] = target_buf;
-	powers[num++] = PET_TARGET;
-	power_desc[num] = _("近くにいろ", "stay close");
-
-	if (p_ptr->pet_follow_distance == PET_CLOSE_DIST) mode = num;
-	powers[num++] = PET_STAY_CLOSE;
-	power_desc[num] = _("ついて来い", "follow me");
-
-	if (p_ptr->pet_follow_distance == PET_FOLLOW_DIST) mode = num;
-	powers[num++] = PET_FOLLOW_ME;
-	power_desc[num] = _("敵を見つけて倒せ", "seek and destroy");
-
-	if (p_ptr->pet_follow_distance == PET_DESTROY_DIST) mode = num;
-	powers[num++] = PET_SEEK_AND_DESTROY;
-	power_desc[num] = _("少し離れていろ", "give me space");
-
-	if (p_ptr->pet_follow_distance == PET_SPACE_DIST) mode = num;
-	powers[num++] = PET_ALLOW_SPACE;
-	power_desc[num] = _("離れていろ", "stay away");
-
-	if (p_ptr->pet_follow_distance == PET_AWAY_DIST) mode = num;
-	powers[num++] = PET_STAY_AWAY;
-
-	if (p_ptr->pet_extra_flags & PF_OPEN_DOORS)
-	{
-		power_desc[num] = _("ドアを開ける (現在:ON)", "pets open doors (now On)");
-	}
-	else
-	{
-		power_desc[num] = _("ドアを開ける (現在:OFF)", "pets open doors (now Off)");
-	}
-	powers[num++] = PET_OPEN_DOORS;
-
-	if (p_ptr->pet_extra_flags & PF_PICKUP_ITEMS)
-	{
-		power_desc[num] = _("アイテムを拾う (現在:ON)", "pets pick up items (now On)");
-	}
-	else
-	{
-		power_desc[num] = _("アイテムを拾う (現在:OFF)", "pets pick up items (now Off)");
-	}
-	powers[num++] = PET_TAKE_ITEMS;
-
-	if (p_ptr->pet_extra_flags & PF_TELEPORT)
-	{
-		power_desc[num] = _("テレポート系魔法を使う (現在:ON)", "allow teleport (now On)");
-	}
-	else
-	{
-		power_desc[num] = _("テレポート系魔法を使う (現在:OFF)", "allow teleport (now Off)");
-	}
-	powers[num++] = PET_TELEPORT;
-
-	if (p_ptr->pet_extra_flags & PF_ATTACK_SPELL)
-	{
-		power_desc[num] = _("攻撃魔法を使う (現在:ON)", "allow cast attack spell (now On)");
-	}
-	else
-	{
-		power_desc[num] = _("攻撃魔法を使う (現在:OFF)", "allow cast attack spell (now Off)");
-	}
-	powers[num++] = PET_ATTACK_SPELL;
-
-	if (p_ptr->pet_extra_flags & PF_SUMMON_SPELL)
-	{
-		power_desc[num] = _("召喚魔法を使う (現在:ON)", "allow cast summon spell (now On)");
-	}
-	else
-	{
-		power_desc[num] = _("召喚魔法を使う (現在:OFF)", "allow cast summon spell (now Off)");
-	}
-	powers[num++] = PET_SUMMON_SPELL;
-
-	if (p_ptr->pet_extra_flags & PF_BALL_SPELL)
-	{
-		power_desc[num] = _("プレイヤーを巻き込む範囲魔法を使う (現在:ON)", "allow involve player in area spell (now On)");
-	}
-	else
-	{
-		power_desc[num] = _("プレイヤーを巻き込む範囲魔法を使う (現在:OFF)", "allow involve player in area spell (now Off)");
-	}
-	powers[num++] = PET_BALL_SPELL;
-
-	if (p_ptr->riding)
-	{
-		power_desc[num] = _("ペットから降りる", "get off a pet");
-	}
-	else
-	{
-		power_desc[num] = _("ペットに乗る", "ride a pet");
-	}
-	powers[num++] = PET_RIDING;
-	power_desc[num] = _("ペットに名前をつける", "name pets");
-	powers[num++] = PET_NAME;
-
-	if (p_ptr->riding)
-	{
-		if ((p_ptr->migite && (empty_hands(FALSE) == EMPTY_HAND_LARM) &&
-		     object_allow_two_hands_wielding(&inventory[INVEN_RARM])) ||
-		    (p_ptr->hidarite && (empty_hands(FALSE) == EMPTY_HAND_RARM) &&
-			 object_allow_two_hands_wielding(&inventory[INVEN_LARM])))
-		{
-			if (p_ptr->pet_extra_flags & PF_RYOUTE)
-			{
-				power_desc[num] = _("武器を片手で持つ", "use one hand to control a riding pet");
-			}
-			else
-			{
-				power_desc[num] = _("武器を両手で持つ", "use both hands for a weapon");
-			}
-
-			powers[num++] = PET_RYOUTE;
-		}
-		else
-		{
-			switch (p_ptr->pclass)
-			{
-			case CLASS_MONK:
-			case CLASS_FORCETRAINER:
-			case CLASS_BERSERKER:
-				if (empty_hands(FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM))
-				{
-					if (p_ptr->pet_extra_flags & PF_RYOUTE)
-					{
-						power_desc[num] = _("片手で格闘する", "use one hand to control a riding pet");
-					}
-					else
-					{
-						power_desc[num] = _("両手で格闘する", "use both hands for melee");
-					}
-
-					powers[num++] = PET_RYOUTE;
-				}
-				else if ((empty_hands(FALSE) != EMPTY_HAND_NONE) && !buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))
-				{
-					if (p_ptr->pet_extra_flags & PF_RYOUTE)
-					{
-						power_desc[num] = _("格闘を行わない", "use one hand to control a riding pet");
-					}
-					else
-					{
-						power_desc[num] = _("格闘を行う", "use one hand for melee");
-					}
-
-					powers[num++] = PET_RYOUTE;
-				}
-				break;
-			}
-		}
-	}
-
-#ifdef ALLOW_REPEAT
-	if (!(repeat_pull(&i) && (i >= 0) && (i < num)))
-	{
-#endif /* ALLOW_REPEAT */
-
-	/* Nothing chosen yet */
-	flag = FALSE;
-
-	/* No redraw yet */
-	redraw = FALSE;
-
-	if (use_menu)
-	{
-		/* Save the screen */
-		screen_save();
-
-		/* Build a prompt */
-		strnfmt(out_val, 78, _("(コマンド、ESC=終了) コマンドを選んでください:", "(Command, ESC=exit) Choose command from menu."));
-	}
-	else
-	{
-		/* Build a prompt */
-		strnfmt(out_val, 78,
-		        _("(コマンド %c-%c、'*'=一覧、ESC=終了) コマンドを選んでください:", "(Command %c-%c, *=List, ESC=exit) Select a command: "),
-		        I2A(0), I2A(num - 1));
-	}
-
-	choice = (always_show_list || use_menu) ? ESCAPE : 1;
-
-	/* Get a command from the user */
-	while (!flag)
-	{
-		int ask = TRUE;
-
-		if (choice == ESCAPE) choice = ' ';
-		else if (!get_com(out_val, &choice, TRUE)) break;
-
-		if (use_menu && (choice != ' '))
-		{
-			switch (choice)
-			{
-			case '0':
-				screen_load();
-				return;
-
-			case '8':
-			case 'k':
-			case 'K':
-				menu_line += (num - 1);
-				break;
-
-			case '2':
-			case 'j':
-			case 'J':
-				menu_line++;
-				break;
-
-			case '4':
-			case 'h':
-			case 'H':
-				menu_line = 1;
-				break;
-
-			case '6':
-			case 'l':
-			case 'L':
-				menu_line = num;
-				break;
-
-			case 'x':
-			case 'X':
-			case '\r':
-			case '\n':
-				i = menu_line - 1;
-				ask = FALSE;
-				break;
-			}
-			if (menu_line > num) menu_line -= num;
-		}
-
-		/* Request redraw */
-		if ((choice == ' ') || (choice == '*') || (choice == '?') || (use_menu && ask))
-		{
-			/* Show the list */
-			if (!redraw || use_menu)
-			{
-				byte y = 1, x = 0;
-				int ctr = 0;
-
-				/* Show list */
-				redraw = TRUE;
-
-				/* Save the screen */
-				if (!use_menu) screen_save();
-
-				prt("", y++, x);
-
-				/* Print list */
-				for (ctr = 0; ctr < num; ctr++)
-				{
-					/* Letter/number for power selection */
-					if (use_menu) 
-						sprintf(buf, "%c%s ", (ctr == mode) ? '*' : ' ', (ctr == (menu_line - 1)) ? _("》", "> ") : "  ");
-					else 
-						sprintf(buf, "%c%c) ", (ctr == mode) ? '*' : ' ', I2A(ctr));
-
-					strcat(buf, power_desc[ctr]);
-
-					prt(buf, y + ctr, x);
-				}
-
-				prt("", y + MIN(ctr, 17), x);
-			}
-
-			/* Hide the list */
-			else
-			{
-				/* Hide list */
-				redraw = FALSE;
-
-				/* Restore the screen */
-				screen_load();
-			}
-
-			/* Redo asking */
-			continue;
-		}
-
-		if (!use_menu)
-		{
-			/* Note verify */
-			ask = (isupper(choice));
-
-			/* Lowercase */
-			if (ask) choice = tolower(choice);
-
-			/* Extract request */
-			i = (islower(choice) ? A2I(choice) : -1);
-		}
-
-		/* Totally Illegal */
-		if ((i < 0) || (i >= num))
-		{
-			bell();
-			continue;
-		}
-
-		/* Verify it */
-		if (ask)
-		{
-			/* Prompt */
-			strnfmt(buf, 78, _("%sを使いますか？ ", "Use %s? "), power_desc[i]);
-
-			/* Belay that order */
-			if (!get_check(buf)) continue;
-		}
-
-		/* Stop the loop */
-		flag = TRUE;
-	}
-
-	/* Restore the screen */
-	if (redraw) screen_load();
-
-	/* Abort if needed */
-	if (!flag)
-	{
-		p_ptr->energy_use = 0;
-		return;
-	}
-
-#ifdef ALLOW_REPEAT
-	repeat_push(i);
-	}
-#endif /* ALLOW_REPEAT */
-
-	switch (powers[i])
-	{
-		case PET_DISMISS: /* Dismiss pets */
-		{
-			/* Check pets (backwards) */
-			for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)
-			{
-				/* Player has pet */
-				if (is_pet(&m_list[pet_ctr])) break;
-			}
-
-			if (!pet_ctr)
-			{
-				msg_print(_("ペットがいない！", "You have no pets!"));
-				break;
-			}
-			do_cmd_pet_dismiss();
-			(void)calculate_upkeep();
-			break;
-		}
-		case PET_TARGET:
-		{
-			project_length = -1;
-			if (!target_set(TARGET_KILL)) pet_t_m_idx = 0;
-			else
-			{
-				cave_type *c_ptr = &cave[target_row][target_col];
-				if (c_ptr->m_idx && (m_list[c_ptr->m_idx].ml))
-				{
-					pet_t_m_idx = cave[target_row][target_col].m_idx;
-					p_ptr->pet_follow_distance = PET_DESTROY_DIST;
-				}
-				else pet_t_m_idx = 0;
-			}
-			project_length = 0;
-
-			break;
-		}
-		/* Call pets */
-		case PET_STAY_CLOSE:
-		{
-			p_ptr->pet_follow_distance = PET_CLOSE_DIST;
-			pet_t_m_idx = 0;
-			break;
-		}
-		/* "Follow Me" */
-		case PET_FOLLOW_ME:
-		{
-			p_ptr->pet_follow_distance = PET_FOLLOW_DIST;
-			pet_t_m_idx = 0;
-			break;
-		}
-		/* "Seek and destoy" */
-		case PET_SEEK_AND_DESTROY:
-		{
-			p_ptr->pet_follow_distance = PET_DESTROY_DIST;
-			break;
-		}
-		/* "Give me space" */
-		case PET_ALLOW_SPACE:
-		{
-			p_ptr->pet_follow_distance = PET_SPACE_DIST;
-			break;
-		}
-		/* "Stay away" */
-		case PET_STAY_AWAY:
-		{
-			p_ptr->pet_follow_distance = PET_AWAY_DIST;
-			break;
-		}
-		/* flag - allow pets to open doors */
-		case PET_OPEN_DOORS:
-		{
-			if (p_ptr->pet_extra_flags & PF_OPEN_DOORS) p_ptr->pet_extra_flags &= ~(PF_OPEN_DOORS);
-			else p_ptr->pet_extra_flags |= (PF_OPEN_DOORS);
-			break;
-		}
-		/* flag - allow pets to pickup items */
-		case PET_TAKE_ITEMS:
-		{
-			if (p_ptr->pet_extra_flags & PF_PICKUP_ITEMS)
-			{
-				p_ptr->pet_extra_flags &= ~(PF_PICKUP_ITEMS);
-				for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)
-				{
-					/* Access the monster */
-					m_ptr = &m_list[pet_ctr];
-
-					if (is_pet(m_ptr))
-					{
-						monster_drop_carried_objects(m_ptr);
-					}
-				}
-			}
-			else p_ptr->pet_extra_flags |= (PF_PICKUP_ITEMS);
-
-			break;
-		}
-		/* flag - allow pets to teleport */
-		case PET_TELEPORT:
-		{
-			if (p_ptr->pet_extra_flags & PF_TELEPORT) p_ptr->pet_extra_flags &= ~(PF_TELEPORT);
-			else p_ptr->pet_extra_flags |= (PF_TELEPORT);
-			break;
-		}
-		/* flag - allow pets to cast attack spell */
-		case PET_ATTACK_SPELL:
-		{
-			if (p_ptr->pet_extra_flags & PF_ATTACK_SPELL) p_ptr->pet_extra_flags &= ~(PF_ATTACK_SPELL);
-			else p_ptr->pet_extra_flags |= (PF_ATTACK_SPELL);
-			break;
-		}
-		/* flag - allow pets to cast attack spell */
-		case PET_SUMMON_SPELL:
-		{
-			if (p_ptr->pet_extra_flags & PF_SUMMON_SPELL) p_ptr->pet_extra_flags &= ~(PF_SUMMON_SPELL);
-			else p_ptr->pet_extra_flags |= (PF_SUMMON_SPELL);
-			break;
-		}
-		/* flag - allow pets to cast attack spell */
-		case PET_BALL_SPELL:
-		{
-			if (p_ptr->pet_extra_flags & PF_BALL_SPELL) p_ptr->pet_extra_flags &= ~(PF_BALL_SPELL);
-			else p_ptr->pet_extra_flags |= (PF_BALL_SPELL);
-			break;
-		}
-
-		case PET_RIDING:
-		{
-			(void)do_riding(FALSE);
-			break;
-		}
-
-		case PET_NAME:
-		{
-			do_name_pet();
-			break;
-		}
-
-		case PET_RYOUTE:
-		{
-			if (p_ptr->pet_extra_flags & PF_RYOUTE) p_ptr->pet_extra_flags &= ~(PF_RYOUTE);
-			else p_ptr->pet_extra_flags |= (PF_RYOUTE);
-			p_ptr->update |= (PU_BONUS);
-			handle_stuff();
-			break;
-		}
-	}
-}