OSDN Git Service

[Refactor] #37353 ペット処理を cmd4.c から cmd-pet.c/h へ分離。
authorDeskull <deskull@users.sourceforge.jp>
Tue, 11 Sep 2018 11:15:42 +0000 (20:15 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Tue, 11 Sep 2018 11:15:42 +0000 (20:15 +0900)
Separate pet control from cmd4.c to cmd-pet.c/h.

16 files changed:
Hengband_vcs2015/Hengband/Hengband.vcxproj
Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
src/cmd-pet.c [new file with mode: 0644]
src/cmd-pet.h [new file with mode: 0644]
src/cmd4.c
src/cmd5.c
src/dungeon.c
src/effects.c
src/externs.h
src/melee1.c
src/melee2.c
src/monster1.c
src/monster2.c
src/racial.c
src/spells1.c
src/xtra2.c

index f85f119..e4a9efa 100644 (file)
     <ClCompile Include="..\..\src\chuukei.c" />\r
     <ClCompile Include="..\..\src\cmd-activate.c" />\r
     <ClCompile Include="..\..\src\cmd-eat.c" />\r
     <ClCompile Include="..\..\src\chuukei.c" />\r
     <ClCompile Include="..\..\src\cmd-activate.c" />\r
     <ClCompile Include="..\..\src\cmd-eat.c" />\r
+    <ClCompile Include="..\..\src\cmd-pet.c" />\r
     <ClCompile Include="..\..\src\cmd-quaff.c" />\r
     <ClCompile Include="..\..\src\cmd-read.c" />\r
     <ClCompile Include="..\..\src\cmd-usestaff.c" />\r
     <ClCompile Include="..\..\src\cmd-quaff.c" />\r
     <ClCompile Include="..\..\src\cmd-read.c" />\r
     <ClCompile Include="..\..\src\cmd-usestaff.c" />\r
     <ClCompile Include="..\..\src\cmd-zapwand.c" />\r
     <ClInclude Include="..\..\src\chest.h" />\r
     <ClInclude Include="..\..\src\cmd-magiceat.h" />\r
     <ClCompile Include="..\..\src\cmd-zapwand.c" />\r
     <ClInclude Include="..\..\src\chest.h" />\r
     <ClInclude Include="..\..\src\cmd-magiceat.h" />\r
+    <ClInclude Include="..\..\src\cmd-pet.h" />\r
     <ClInclude Include="..\..\src\cmd-zaprod.h" />\r
     <ClInclude Include="..\..\src\cmd-zapwand.h">\r
       <FileType>CppCode</FileType>\r
     <ClInclude Include="..\..\src\cmd-zaprod.h" />\r
     <ClInclude Include="..\..\src\cmd-zapwand.h">\r
       <FileType>CppCode</FileType>\r
index b53aa7a..ca53fae 100644 (file)
     <ClCompile Include="..\..\src\rooms_normal.c">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\rooms_normal.c">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\cmd-pet.c">\r
+      <Filter>Source</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\angband.h">\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\angband.h">\r
     <ClInclude Include="..\..\src\rooms_normal.h">\r
       <Filter>Header</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\rooms_normal.h">\r
       <Filter>Header</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\cmd-pet.h">\r
+      <Filter>Header</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\src\angband.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\src\angband.rc" />\r
diff --git a/src/cmd-pet.c b/src/cmd-pet.c
new file mode 100644 (file)
index 0000000..4e9ba82
--- /dev/null
@@ -0,0 +1,1203 @@
+#include "angband.h"\r
+\r
+/*!\r
+* @brief \83v\83\8c\83C\83\84\81[\82Ì\8bR\8fæ/\89º\94n\8f\88\97\9d\94»\92è\r
+* @param c_ptr \83v\83\8c\83C\83\84\81[\82Ì\88Ú\93®\90æ\83}\83X\82Ì\8d\\91¢\91Ì\8eQ\8fÆ\83|\83C\83\93\83^\r
+* @param now_riding TRUE\82È\82ç\89º\94n\8f\88\97\9d\81AFALSE\82È\82ç\82Î\8bR\8fæ\8f\88\97\9d\r
+* @return \89Â\94\\82È\82ç\82ÎTRUE\82ð\95Ô\82·\r
+*/\r
+bool player_can_ride_aux(cave_type *c_ptr, bool now_riding)\r
+{\r
+       bool p_can_enter;\r
+       bool old_character_xtra = character_xtra;\r
+       MONSTER_IDX old_riding = p_ptr->riding;\r
+       bool old_riding_ryoute = p_ptr->riding_ryoute;\r
+       bool old_old_riding_ryoute = p_ptr->old_riding_ryoute;\r
+       bool old_pf_ryoute = (p_ptr->pet_extra_flags & PF_RYOUTE) ? TRUE : FALSE;\r
+\r
+       /* Hack -- prevent "icky" message */\r
+       character_xtra = TRUE;\r
+\r
+       if (now_riding) p_ptr->riding = c_ptr->m_idx;\r
+       else\r
+       {\r
+               p_ptr->riding = 0;\r
+               p_ptr->pet_extra_flags &= ~(PF_RYOUTE);\r
+               p_ptr->riding_ryoute = p_ptr->old_riding_ryoute = FALSE;\r
+       }\r
+\r
+       calc_bonuses();\r
+\r
+       p_can_enter = player_can_enter(c_ptr->feat, CEM_P_CAN_ENTER_PATTERN);\r
+\r
+       p_ptr->riding = old_riding;\r
+       if (old_pf_ryoute) p_ptr->pet_extra_flags |= (PF_RYOUTE);\r
+       else p_ptr->pet_extra_flags &= ~(PF_RYOUTE);\r
+       p_ptr->riding_ryoute = old_riding_ryoute;\r
+       p_ptr->old_riding_ryoute = old_old_riding_ryoute;\r
+\r
+       calc_bonuses();\r
+\r
+       character_xtra = old_character_xtra;\r
+\r
+       return p_can_enter;\r
+}\r
+\r
+\r
+/*!\r
+* @brief \83y\83b\83g\82É\82È\82Á\82Ä\82¢\82é\83\82\83\93\83X\83^\81[\82ð\83\\81[\83g\82·\82é\82½\82ß\82Ì\94ä\8ar\8f\88\97\9d\r
+* @param u \83\82\83\93\83X\83^\81[\82Ì\8d\\91¢\91Ì\94z\97ñ\r
+* @param v \96¢\8eg\97p\r
+* @param a \94ä\8ar\91Î\8fÛ\82Ì\83\82\83\93\83X\83^\81[ID1\r
+* @param b \94ä\8ar\91Î\8fÛ\82Ì\83\82\83\93\83X\83^\81[ID2\r
+* @return 2\94Ô\96Ú\82ª\91å\82È\82ç\82ÎTRUE\82ð\95Ô\82·\r
+*/\r
+static bool ang_sort_comp_pet_dismiss(vptr u, vptr v, int a, int b)\r
+{\r
+       u16b *who = (u16b*)(u);\r
+\r
+       int w1 = who[a];\r
+       int w2 = who[b];\r
+\r
+       monster_type *m_ptr1 = &m_list[w1];\r
+       monster_type *m_ptr2 = &m_list[w2];\r
+       monster_race *r_ptr1 = &r_info[m_ptr1->r_idx];\r
+       monster_race *r_ptr2 = &r_info[m_ptr2->r_idx];\r
+\r
+       /* Unused */\r
+       (void)v;\r
+\r
+       if (w1 == p_ptr->riding) return TRUE;\r
+       if (w2 == p_ptr->riding) return FALSE;\r
+\r
+       if (m_ptr1->nickname && !m_ptr2->nickname) return TRUE;\r
+       if (m_ptr2->nickname && !m_ptr1->nickname) return FALSE;\r
+\r
+       if (!m_ptr1->parent_m_idx && m_ptr2->parent_m_idx) return TRUE;\r
+       if (!m_ptr2->parent_m_idx && m_ptr1->parent_m_idx) return FALSE;\r
+\r
+       if ((r_ptr1->flags1 & RF1_UNIQUE) && !(r_ptr2->flags1 & RF1_UNIQUE)) return TRUE;\r
+       if ((r_ptr2->flags1 & RF1_UNIQUE) && !(r_ptr1->flags1 & RF1_UNIQUE)) return FALSE;\r
+\r
+       if (r_ptr1->level > r_ptr2->level) return TRUE;\r
+       if (r_ptr2->level > r_ptr1->level) return FALSE;\r
+\r
+       if (m_ptr1->hp > m_ptr2->hp) return TRUE;\r
+       if (m_ptr2->hp > m_ptr1->hp) return FALSE;\r
+\r
+       return w1 <= w2;\r
+}\r
+\r
+\r
+/*!\r
+* @brief \83y\83b\83g\82Ì\88Û\8e\9d\83R\83X\83g\8cv\8eZ\r
+* @return \88Û\8e\9d\83R\83X\83g(%)\r
+*/\r
+int calculate_upkeep(void)\r
+{\r
+       s32b old_friend_align = friend_align;\r
+       MONSTER_IDX m_idx;\r
+       bool have_a_unique = FALSE;\r
+       s32b total_friend_levels = 0;\r
+\r
+       total_friends = 0;\r
+       friend_align = 0;\r
+\r
+       for (m_idx = m_max - 1; m_idx >= 1; m_idx--)\r
+       {\r
+               monster_type *m_ptr;\r
+               monster_race *r_ptr;\r
+\r
+               m_ptr = &m_list[m_idx];\r
+               if (!m_ptr->r_idx) continue;\r
+               r_ptr = &r_info[m_ptr->r_idx];\r
+\r
+               if (is_pet(m_ptr))\r
+               {\r
+                       total_friends++;\r
+                       if (r_ptr->flags1 & RF1_UNIQUE)\r
+                       {\r
+                               if (p_ptr->pclass == CLASS_CAVALRY)\r
+                               {\r
+                                       if (p_ptr->riding == m_idx)\r
+                                               total_friend_levels += (r_ptr->level + 5) * 2;\r
+                                       else if (!have_a_unique && (r_info[m_ptr->r_idx].flags7 & RF7_RIDING))\r
+                                               total_friend_levels += (r_ptr->level + 5) * 7 / 2;\r
+                                       else\r
+                                               total_friend_levels += (r_ptr->level + 5) * 10;\r
+                                       have_a_unique = TRUE;\r
+                               }\r
+                               else\r
+                                       total_friend_levels += (r_ptr->level + 5) * 10;\r
+                       }\r
+                       else\r
+                               total_friend_levels += r_ptr->level;\r
+\r
+                       /* Determine pet alignment */\r
+                       if (r_ptr->flags3 & RF3_GOOD) friend_align += r_ptr->level;\r
+                       if (r_ptr->flags3 & RF3_EVIL) friend_align -= r_ptr->level;\r
+               }\r
+       }\r
+       if (old_friend_align != friend_align) p_ptr->update |= (PU_BONUS);\r
+       if (total_friends)\r
+       {\r
+               int upkeep_factor;\r
+               upkeep_factor = (total_friend_levels - (p_ptr->lev * 80 / (cp_ptr->pet_upkeep_div)));\r
+               if (upkeep_factor < 0) upkeep_factor = 0;\r
+               if (upkeep_factor > 1000) upkeep_factor = 1000;\r
+               return upkeep_factor;\r
+       }\r
+       else\r
+               return 0;\r
+}\r
+\r
+/*!\r
+* @brief \83y\83b\83g\82ð\8aJ\95ú\82·\82é\83R\83}\83\93\83h\82Ì\83\81\83C\83\93\83\8b\81[\83`\83\93\r
+* @return \82È\82µ\r
+*/\r
+void do_cmd_pet_dismiss(void)\r
+{\r
+       monster_type    *m_ptr;\r
+       bool            all_pets = FALSE;\r
+       MONSTER_IDX pet_ctr;\r
+       int i;\r
+       int Dismissed = 0;\r
+\r
+       MONSTER_IDX *who;\r
+       u16b dummy_why;\r
+       int max_pet = 0;\r
+       bool_hack cu, cv;\r
+\r
+       cu = Term->scr->cu;\r
+       cv = Term->scr->cv;\r
+       Term->scr->cu = 0;\r
+       Term->scr->cv = 1;\r
+\r
+       /* Allocate the "who" array */\r
+       C_MAKE(who, max_m_idx, MONSTER_IDX);\r
+\r
+       /* Process the monsters (backwards) */\r
+       for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)\r
+       {\r
+               if (is_pet(&m_list[pet_ctr]))\r
+                       who[max_pet++] = pet_ctr;\r
+       }\r
+\r
+       /* Select the sort method */\r
+       ang_sort_comp = ang_sort_comp_pet_dismiss;\r
+       ang_sort_swap = ang_sort_swap_hook;\r
+\r
+       ang_sort(who, &dummy_why, max_pet);\r
+\r
+       /* Process the monsters (backwards) */\r
+       for (i = 0; i < max_pet; i++)\r
+       {\r
+               bool delete_this;\r
+               char friend_name[80];\r
+               bool kakunin;\r
+\r
+               /* Access the monster */\r
+               pet_ctr = who[i];\r
+               m_ptr = &m_list[pet_ctr];\r
+\r
+               delete_this = FALSE;\r
+               kakunin = ((pet_ctr == p_ptr->riding) || (m_ptr->nickname));\r
+               monster_desc(friend_name, m_ptr, MD_ASSUME_VISIBLE);\r
+\r
+               if (!all_pets)\r
+               {\r
+                       /* Hack -- health bar for this monster */\r
+                       health_track(pet_ctr);\r
+\r
+                       /* Hack -- handle stuff */\r
+                       handle_stuff();\r
+\r
+                       msg_format(_("%s\82ð\95ú\82µ\82Ü\82·\82©\81H [Yes/No/Unnamed (%d\91Ì)]", "Dismiss %s? [Yes/No/Unnamed (%d remain)]"), friend_name, max_pet - i);\r
+\r
+                       if (m_ptr->ml)\r
+                               move_cursor_relative(m_ptr->fy, m_ptr->fx);\r
+\r
+                       while (TRUE)\r
+                       {\r
+                               char ch = inkey();\r
+\r
+                               if (ch == 'Y' || ch == 'y')\r
+                               {\r
+                                       delete_this = TRUE;\r
+\r
+                                       if (kakunin)\r
+                                       {\r
+                                               msg_format(_("\96{\93\96\82É\82æ\82ë\82µ\82¢\82Å\82·\82©\81H (%s) ", "Are you sure? (%s) "), friend_name);\r
+                                               ch = inkey();\r
+                                               if (ch != 'Y' && ch != 'y')\r
+                                                       delete_this = FALSE;\r
+                                       }\r
+                                       break;\r
+                               }\r
+\r
+                               if (ch == 'U' || ch == 'u')\r
+                               {\r
+                                       all_pets = TRUE;\r
+                                       break;\r
+                               }\r
+\r
+                               if (ch == ESCAPE || ch == 'N' || ch == 'n')\r
+                                       break;\r
+\r
+                               bell();\r
+                       }\r
+               }\r
+\r
+               if ((all_pets && !kakunin) || (!all_pets && delete_this))\r
+               {\r
+                       if (record_named_pet && m_ptr->nickname)\r
+                       {\r
+                               char m_name[80];\r
+\r
+                               monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);\r
+                               do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);\r
+                       }\r
+\r
+                       if (pet_ctr == p_ptr->riding)\r
+                       {\r
+                               msg_format(_("%s\82©\82ç\8d~\82è\82½\81B", "You have got off %s. "), friend_name);\r
+\r
+                               p_ptr->riding = 0;\r
+\r
+                               /* Update the monsters */\r
+                               p_ptr->update |= (PU_BONUS | PU_MONSTERS);\r
+                               p_ptr->redraw |= (PR_EXTRA | PR_UHEALTH);\r
+                       }\r
+\r
+                       /* HACK : Add the line to message buffer */\r
+                       msg_format(_("%s \82ð\95ú\82µ\82½\81B", "Dismissed %s."), friend_name);\r
+                       p_ptr->window |= (PW_MESSAGE);\r
+                       window_stuff();\r
+\r
+                       delete_monster_idx(pet_ctr);\r
+                       Dismissed++;\r
+               }\r
+       }\r
+\r
+       Term->scr->cu = cu;\r
+       Term->scr->cv = cv;\r
+       Term_fresh();\r
+\r
+       C_KILL(who, max_m_idx, MONSTER_IDX);\r
+\r
+#ifdef JP\r
+       msg_format("%d \91Ì\82Ì\83y\83b\83g\82ð\95ú\82µ\82Ü\82µ\82½\81B", Dismissed);\r
+#else\r
+       msg_format("You have dismissed %d pet%s.", Dismissed,\r
+               (Dismissed == 1 ? "" : "s"));\r
+#endif\r
+       if (Dismissed == 0 && all_pets)\r
+               msg_print(_("'U'nnamed \82Í\81A\8fæ\94n\88È\8aO\82Ì\96¼\91O\82Ì\82È\82¢\83y\83b\83g\82¾\82¯\82ð\91S\82Ä\89ð\95ú\82µ\82Ü\82·\81B", "'U'nnamed means all your pets except named pets and your mount."));\r
+}\r
+\r
+\r
+\r
+/*!\r
+* @brief \83y\83b\83g\82©\82ç\8bR\8fæ/\89º\94n\82·\82é\83R\83}\83\93\83h\82Ì\83\81\83C\83\93\83\8b\81[\83`\83\93 /\r
+* @param force \8b­\90§\93I\82É\8bR\8fæ/\89º\94n\82·\82é\82È\82ç\82ÎTRUE\r
+* @return \8bR\8fæ/\89º\94n\82Å\82«\82½\82çTRUE\r
+*/\r
+bool do_riding(bool force)\r
+{\r
+       int x, y, dir = 0;\r
+       cave_type *c_ptr;\r
+       monster_type *m_ptr;\r
+\r
+       if (!get_rep_dir2(&dir)) return FALSE;\r
+       y = p_ptr->y + ddy[dir];\r
+       x = p_ptr->x + ddx[dir];\r
+       c_ptr = &cave[y][x];\r
+\r
+       if (p_ptr->special_defense & KATA_MUSOU) set_action(ACTION_NONE);\r
+\r
+       if (p_ptr->riding)\r
+       {\r
+               /* Skip non-empty grids */\r
+               if (!player_can_ride_aux(c_ptr, FALSE))\r
+               {\r
+                       msg_print(_("\82»\82¿\82ç\82É\82Í\8d~\82è\82ç\82ê\82Ü\82¹\82ñ\81B", "You cannot go to that direction."));\r
+                       return FALSE;\r
+               }\r
+\r
+               if (!pattern_seq(p_ptr->y, p_ptr->x, y, x)) return FALSE;\r
+\r
+               if (c_ptr->m_idx)\r
+               {\r
+                       /* Take a turn */\r
+                       p_ptr->energy_use = 100;\r
+\r
+                       /* Message */\r
+                       msg_print(_("\83\82\83\93\83X\83^\81[\82ª\97§\82¿\82Ó\82³\82ª\82Á\82Ä\82¢\82é\81I", "There is a monster in the way!"));\r
+\r
+                       py_attack(y, x, 0);\r
+                       return FALSE;\r
+               }\r
+\r
+               p_ptr->riding = 0;\r
+               p_ptr->pet_extra_flags &= ~(PF_RYOUTE);\r
+               p_ptr->riding_ryoute = p_ptr->old_riding_ryoute = FALSE;\r
+       }\r
+       else\r
+       {\r
+               if (p_ptr->confused)\r
+               {\r
+                       msg_print(_("\8d¬\97\90\82µ\82Ä\82¢\82Ä\8fæ\82ê\82È\82¢\81I", "You are too confused!"));\r
+                       return FALSE;\r
+               }\r
+\r
+               m_ptr = &m_list[c_ptr->m_idx];\r
+\r
+               if (!c_ptr->m_idx || !m_ptr->ml)\r
+               {\r
+                       msg_print(_("\82»\82Ì\8fê\8f\8a\82É\82Í\83\82\83\93\83X\83^\81[\82Í\82¢\82Ü\82¹\82ñ\81B", "Here is no monster."));\r
+                       return FALSE;\r
+               }\r
+               if (!is_pet(m_ptr) && !force)\r
+               {\r
+                       msg_print(_("\82»\82Ì\83\82\83\93\83X\83^\81[\82Í\83y\83b\83g\82Å\82Í\82 \82è\82Ü\82¹\82ñ\81B", "That monster is not a pet."));\r
+                       return FALSE;\r
+               }\r
+               if (!(r_info[m_ptr->r_idx].flags7 & RF7_RIDING))\r
+               {\r
+                       msg_print(_("\82»\82Ì\83\82\83\93\83X\83^\81[\82É\82Í\8fæ\82ê\82È\82³\82»\82¤\82¾\81B", "This monster doesn't seem suitable for riding."));\r
+                       return FALSE;\r
+               }\r
+\r
+               if (!pattern_seq(p_ptr->y, p_ptr->x, y, x)) return FALSE;\r
+\r
+               if (!player_can_ride_aux(c_ptr, TRUE))\r
+               {\r
+                       /* Feature code (applying "mimic" field) */\r
+                       feature_type *f_ptr = &f_info[get_feat_mimic(c_ptr)];\r
+#ifdef JP\r
+                       msg_format("\82»\82Ì\83\82\83\93\83X\83^\81[\82Í%s\82Ì%s\82É\82¢\82é\81B", f_name + f_ptr->name,\r
+                               ((!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY)) ||\r
+                                       (!have_flag(f_ptr->flags, FF_LOS) && !have_flag(f_ptr->flags, FF_TREE))) ?\r
+                               "\92\86" : "\8fã");\r
+#else\r
+                       msg_format("This monster is %s the %s.",\r
+                               ((!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY)) ||\r
+                                       (!have_flag(f_ptr->flags, FF_LOS) && !have_flag(f_ptr->flags, FF_TREE))) ?\r
+                               "in" : "on", f_name + f_ptr->name);\r
+#endif\r
+\r
+                       return FALSE;\r
+               }\r
+               if (r_info[m_ptr->r_idx].level > randint1((p_ptr->skill_exp[GINOU_RIDING] / 50 + p_ptr->lev / 2 + 20)))\r
+               {\r
+                       msg_print(_("\82¤\82Ü\82­\8fæ\82ê\82È\82©\82Á\82½\81B", "You failed to ride."));\r
+                       p_ptr->energy_use = 100;\r
+                       return FALSE;\r
+               }\r
+\r
+               if (MON_CSLEEP(m_ptr))\r
+               {\r
+                       char m_name[80];\r
+                       monster_desc(m_name, m_ptr, 0);\r
+                       (void)set_monster_csleep(c_ptr->m_idx, 0);\r
+                       msg_format(_("%s\82ð\8bN\82±\82µ\82½\81B", "You have waked %s up."), m_name);\r
+               }\r
+\r
+               if (p_ptr->action == ACTION_KAMAE) set_action(ACTION_NONE);\r
+\r
+               p_ptr->riding = c_ptr->m_idx;\r
+\r
+               /* Hack -- remove tracked monster */\r
+               if (p_ptr->riding == p_ptr->health_who) health_track(0);\r
+       }\r
+\r
+       p_ptr->energy_use = 100;\r
+\r
+       /* Mega-Hack -- Forget the view and lite */\r
+       p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);\r
+\r
+       /* Update the monsters */\r
+       p_ptr->update |= (PU_BONUS);\r
+\r
+       /* Redraw map */\r
+       p_ptr->redraw |= (PR_MAP | PR_EXTRA);\r
+\r
+       p_ptr->redraw |= (PR_UHEALTH);\r
+\r
+       /* Move the player */\r
+       (void)move_player_effect(y, x, MPE_HANDLE_STUFF | MPE_ENERGY_USE | MPE_DONT_PICKUP | MPE_DONT_SWAP_MON);\r
+\r
+       return TRUE;\r
+}\r
+\r
+/*!\r
+* @brief \83y\83b\83g\82É\96¼\91O\82ð\82Â\82¯\82é\83R\83}\83\93\83h\82Ì\83\81\83C\83\93\83\8b\81[\83`\83\93\r
+* @return \82È\82µ\r
+*/\r
+static void do_name_pet(void)\r
+{\r
+       monster_type *m_ptr;\r
+       char out_val[20];\r
+       char m_name[80];\r
+       bool old_name = FALSE;\r
+       bool old_target_pet = target_pet;\r
+\r
+       target_pet = TRUE;\r
+       if (!target_set(TARGET_KILL))\r
+       {\r
+               target_pet = old_target_pet;\r
+               return;\r
+       }\r
+       target_pet = old_target_pet;\r
+\r
+       if (cave[target_row][target_col].m_idx)\r
+       {\r
+               m_ptr = &m_list[cave[target_row][target_col].m_idx];\r
+\r
+               if (!is_pet(m_ptr))\r
+               {\r
+                       /* Message */\r
+                       msg_print(_("\82»\82Ì\83\82\83\93\83X\83^\81[\82Í\83y\83b\83g\82Å\82Í\82È\82¢\81B", "This monster is not a pet."));\r
+                       return;\r
+               }\r
+               if (r_info[m_ptr->r_idx].flags1 & RF1_UNIQUE)\r
+               {\r
+                       msg_print(_("\82»\82Ì\83\82\83\93\83X\83^\81[\82Ì\96¼\91O\82Í\95Ï\82¦\82ç\82ê\82È\82¢\81I", "You cannot change name of this monster!"));\r
+                       return;\r
+               }\r
+               monster_desc(m_name, m_ptr, 0);\r
+\r
+               /* Message */\r
+               msg_format(_("%s\82É\96¼\91O\82ð\82Â\82¯\82é\81B", "Name %s."), m_name);\r
+               msg_print(NULL);\r
+\r
+               /* Start with nothing */\r
+               strcpy(out_val, "");\r
+\r
+               /* Use old inscription */\r
+               if (m_ptr->nickname)\r
+               {\r
+                       /* Start with the old inscription */\r
+                       strcpy(out_val, quark_str(m_ptr->nickname));\r
+                       old_name = TRUE;\r
+               }\r
+\r
+               /* Get a new inscription (possibly empty) */\r
+               if (get_string(_("\96¼\91O: ", "Name: "), out_val, 15))\r
+               {\r
+                       if (out_val[0])\r
+                       {\r
+                               /* Save the inscription */\r
+                               m_ptr->nickname = quark_add(out_val);\r
+                               if (record_named_pet)\r
+                               {\r
+                                       monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);\r
+                                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_NAME, m_name);\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               if (record_named_pet && old_name)\r
+                               {\r
+                                       monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);\r
+                                       do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_UNNAME, m_name);\r
+                               }\r
+                               m_ptr->nickname = 0;\r
+                       }\r
+               }\r
+       }\r
+}\r
+\r
+\r
+/*!\r
+* @brief \83y\83b\83g\82É\8aÖ\82·\82é\83R\83}\83\93\83h\83\8a\83X\83g\82Ì\83\81\83C\83\93\83\8b\81[\83`\83\93 /\r
+* Issue a pet command\r
+* @return \82È\82µ\r
+*/\r
+void do_cmd_pet(void)\r
+{\r
+       COMMAND_CODE i = 0;\r
+       int                     num;\r
+       int                     powers[36];\r
+       cptr                    power_desc[36];\r
+       bool                    flag, redraw;\r
+       char                    choice;\r
+       char                    out_val[160];\r
+       int                     pet_ctr;\r
+       monster_type    *m_ptr;\r
+\r
+       PET_COMMAND_IDX mode = 0;\r
+\r
+       char buf[160];\r
+       char target_buf[160];\r
+\r
+       int menu_line = use_menu ? 1 : 0;\r
+\r
+       num = 0;\r
+\r
+       power_desc[num] = _("\83y\83b\83g\82ð\95ú\82·", "dismiss pets");\r
+       powers[num++] = PET_DISMISS;\r
+\r
+#ifdef JP\r
+       sprintf(target_buf, "\83y\83b\83g\82Ì\83^\81[\83Q\83b\83g\82ð\8ew\92è (\8c»\8dÝ\81F%s)",\r
+               (pet_t_m_idx ? (p_ptr->image ? "\89½\82©\8aï\96­\82È\95¨" : (r_name + r_info[m_list[pet_t_m_idx].ap_r_idx].name)) : "\8ew\92è\82È\82µ"));\r
+#else\r
+       sprintf(target_buf, "specify a target of pet (now:%s)",\r
+               (pet_t_m_idx ? (p_ptr->image ? "something strange" : (r_name + r_info[m_list[pet_t_m_idx].ap_r_idx].name)) : "nothing"));\r
+#endif\r
+       power_desc[num] = target_buf;\r
+       powers[num++] = PET_TARGET;\r
+       power_desc[num] = _("\8bß\82­\82É\82¢\82ë", "stay close");\r
+\r
+       if (p_ptr->pet_follow_distance == PET_CLOSE_DIST) mode = num;\r
+       powers[num++] = PET_STAY_CLOSE;\r
+       power_desc[num] = _("\82Â\82¢\82Ä\97\88\82¢", "follow me");\r
+\r
+       if (p_ptr->pet_follow_distance == PET_FOLLOW_DIST) mode = num;\r
+       powers[num++] = PET_FOLLOW_ME;\r
+       power_desc[num] = _("\93G\82ð\8c©\82Â\82¯\82Ä\93|\82¹", "seek and destroy");\r
+\r
+       if (p_ptr->pet_follow_distance == PET_DESTROY_DIST) mode = num;\r
+       powers[num++] = PET_SEEK_AND_DESTROY;\r
+       power_desc[num] = _("\8f­\82µ\97£\82ê\82Ä\82¢\82ë", "give me space");\r
+\r
+       if (p_ptr->pet_follow_distance == PET_SPACE_DIST) mode = num;\r
+       powers[num++] = PET_ALLOW_SPACE;\r
+       power_desc[num] = _("\97£\82ê\82Ä\82¢\82ë", "stay away");\r
+\r
+       if (p_ptr->pet_follow_distance == PET_AWAY_DIST) mode = num;\r
+       powers[num++] = PET_STAY_AWAY;\r
+\r
+       if (p_ptr->pet_extra_flags & PF_OPEN_DOORS)\r
+       {\r
+               power_desc[num] = _("\83h\83A\82ð\8aJ\82¯\82é (\8c»\8dÝ:ON)", "pets open doors (now On)");\r
+       }\r
+       else\r
+       {\r
+               power_desc[num] = _("\83h\83A\82ð\8aJ\82¯\82é (\8c»\8dÝ:OFF)", "pets open doors (now Off)");\r
+       }\r
+       powers[num++] = PET_OPEN_DOORS;\r
+\r
+       if (p_ptr->pet_extra_flags & PF_PICKUP_ITEMS)\r
+       {\r
+               power_desc[num] = _("\83A\83C\83e\83\80\82ð\8fE\82¤ (\8c»\8dÝ:ON)", "pets pick up items (now On)");\r
+       }\r
+       else\r
+       {\r
+               power_desc[num] = _("\83A\83C\83e\83\80\82ð\8fE\82¤ (\8c»\8dÝ:OFF)", "pets pick up items (now Off)");\r
+       }\r
+       powers[num++] = PET_TAKE_ITEMS;\r
+\r
+       if (p_ptr->pet_extra_flags & PF_TELEPORT)\r
+       {\r
+               power_desc[num] = _("\83e\83\8c\83|\81[\83g\8cn\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:ON)", "allow teleport (now On)");\r
+       }\r
+       else\r
+       {\r
+               power_desc[num] = _("\83e\83\8c\83|\81[\83g\8cn\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:OFF)", "allow teleport (now Off)");\r
+       }\r
+       powers[num++] = PET_TELEPORT;\r
+\r
+       if (p_ptr->pet_extra_flags & PF_ATTACK_SPELL)\r
+       {\r
+               power_desc[num] = _("\8dU\8c\82\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:ON)", "allow cast attack spell (now On)");\r
+       }\r
+       else\r
+       {\r
+               power_desc[num] = _("\8dU\8c\82\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:OFF)", "allow cast attack spell (now Off)");\r
+       }\r
+       powers[num++] = PET_ATTACK_SPELL;\r
+\r
+       if (p_ptr->pet_extra_flags & PF_SUMMON_SPELL)\r
+       {\r
+               power_desc[num] = _("\8f¢\8a«\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:ON)", "allow cast summon spell (now On)");\r
+       }\r
+       else\r
+       {\r
+               power_desc[num] = _("\8f¢\8a«\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:OFF)", "allow cast summon spell (now Off)");\r
+       }\r
+       powers[num++] = PET_SUMMON_SPELL;\r
+\r
+       if (p_ptr->pet_extra_flags & PF_BALL_SPELL)\r
+       {\r
+               power_desc[num] = _("\83v\83\8c\83C\83\84\81[\82ð\8aª\82«\8d\9e\82Þ\94Í\88Í\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:ON)", "allow involve player in area spell (now On)");\r
+       }\r
+       else\r
+       {\r
+               power_desc[num] = _("\83v\83\8c\83C\83\84\81[\82ð\8aª\82«\8d\9e\82Þ\94Í\88Í\96\82\96@\82ð\8eg\82¤ (\8c»\8dÝ:OFF)", "allow involve player in area spell (now Off)");\r
+       }\r
+       powers[num++] = PET_BALL_SPELL;\r
+\r
+       if (p_ptr->riding)\r
+       {\r
+               power_desc[num] = _("\83y\83b\83g\82©\82ç\8d~\82è\82é", "get off a pet");\r
+       }\r
+       else\r
+       {\r
+               power_desc[num] = _("\83y\83b\83g\82É\8fæ\82é", "ride a pet");\r
+       }\r
+       powers[num++] = PET_RIDING;\r
+       power_desc[num] = _("\83y\83b\83g\82É\96¼\91O\82ð\82Â\82¯\82é", "name pets");\r
+       powers[num++] = PET_NAME;\r
+\r
+       if (p_ptr->riding)\r
+       {\r
+               if ((p_ptr->migite && (empty_hands(FALSE) == EMPTY_HAND_LARM) &&\r
+                       object_allow_two_hands_wielding(&inventory[INVEN_RARM])) ||\r
+                       (p_ptr->hidarite && (empty_hands(FALSE) == EMPTY_HAND_RARM) &&\r
+                               object_allow_two_hands_wielding(&inventory[INVEN_LARM])))\r
+               {\r
+                       if (p_ptr->pet_extra_flags & PF_RYOUTE)\r
+                       {\r
+                               power_desc[num] = _("\95\90\8aí\82ð\95Ð\8eè\82Å\8e\9d\82Â", "use one hand to control a riding pet");\r
+                       }\r
+                       else\r
+                       {\r
+                               power_desc[num] = _("\95\90\8aí\82ð\97¼\8eè\82Å\8e\9d\82Â", "use both hands for a weapon");\r
+                       }\r
+\r
+                       powers[num++] = PET_RYOUTE;\r
+               }\r
+               else\r
+               {\r
+                       switch (p_ptr->pclass)\r
+                       {\r
+                       case CLASS_MONK:\r
+                       case CLASS_FORCETRAINER:\r
+                       case CLASS_BERSERKER:\r
+                               if (empty_hands(FALSE) == (EMPTY_HAND_RARM | EMPTY_HAND_LARM))\r
+                               {\r
+                                       if (p_ptr->pet_extra_flags & PF_RYOUTE)\r
+                                       {\r
+                                               power_desc[num] = _("\95Ð\8eè\82Å\8ai\93¬\82·\82é", "use one hand to control a riding pet");\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               power_desc[num] = _("\97¼\8eè\82Å\8ai\93¬\82·\82é", "use both hands for melee");\r
+                                       }\r
+\r
+                                       powers[num++] = PET_RYOUTE;\r
+                               }\r
+                               else if ((empty_hands(FALSE) != EMPTY_HAND_NONE) && !buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))\r
+                               {\r
+                                       if (p_ptr->pet_extra_flags & PF_RYOUTE)\r
+                                       {\r
+                                               power_desc[num] = _("\8ai\93¬\82ð\8ds\82í\82È\82¢", "use one hand to control a riding pet");\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               power_desc[num] = _("\8ai\93¬\82ð\8ds\82¤", "use one hand for melee");\r
+                                       }\r
+\r
+                                       powers[num++] = PET_RYOUTE;\r
+                               }\r
+                               break;\r
+                       }\r
+               }\r
+       }\r
+\r
+#ifdef ALLOW_REPEAT\r
+       if (!(repeat_pull(&i) && (i >= 0) && (i < num)))\r
+       {\r
+#endif /* ALLOW_REPEAT */\r
+\r
+               /* Nothing chosen yet */\r
+               flag = FALSE;\r
+\r
+               /* No redraw yet */\r
+               redraw = FALSE;\r
+\r
+               if (use_menu)\r
+               {\r
+                       /* Save the screen */\r
+                       screen_save();\r
+\r
+                       /* Build a prompt */\r
+                       strnfmt(out_val, 78, _("(\83R\83}\83\93\83h\81AESC=\8fI\97¹) \83R\83}\83\93\83h\82ð\91I\82ñ\82Å\82­\82¾\82³\82¢:", "(Command, ESC=exit) Choose command from menu."));\r
+               }\r
+               else\r
+               {\r
+                       /* Build a prompt */\r
+                       strnfmt(out_val, 78,\r
+                               _("(\83R\83}\83\93\83h %c-%c\81A'*'=\88ê\97\97\81AESC=\8fI\97¹) \83R\83}\83\93\83h\82ð\91I\82ñ\82Å\82­\82¾\82³\82¢:", "(Command %c-%c, *=List, ESC=exit) Select a command: "),\r
+                               I2A(0), I2A(num - 1));\r
+               }\r
+\r
+               choice = (always_show_list || use_menu) ? ESCAPE : 1;\r
+\r
+               /* Get a command from the user */\r
+               while (!flag)\r
+               {\r
+                       int ask = TRUE;\r
+\r
+                       if (choice == ESCAPE) choice = ' ';\r
+                       else if (!get_com(out_val, &choice, TRUE)) break;\r
+\r
+                       if (use_menu && (choice != ' '))\r
+                       {\r
+                               switch (choice)\r
+                               {\r
+                               case '0':\r
+                                       screen_load();\r
+                                       return;\r
+\r
+                               case '8':\r
+                               case 'k':\r
+                               case 'K':\r
+                                       menu_line += (num - 1);\r
+                                       break;\r
+\r
+                               case '2':\r
+                               case 'j':\r
+                               case 'J':\r
+                                       menu_line++;\r
+                                       break;\r
+\r
+                               case '4':\r
+                               case 'h':\r
+                               case 'H':\r
+                                       menu_line = 1;\r
+                                       break;\r
+\r
+                               case '6':\r
+                               case 'l':\r
+                               case 'L':\r
+                                       menu_line = num;\r
+                                       break;\r
+\r
+                               case 'x':\r
+                               case 'X':\r
+                               case '\r':\r
+                               case '\n':\r
+                                       i = menu_line - 1;\r
+                                       ask = FALSE;\r
+                                       break;\r
+                               }\r
+                               if (menu_line > num) menu_line -= num;\r
+                       }\r
+\r
+                       /* Request redraw */\r
+                       if ((choice == ' ') || (choice == '*') || (choice == '?') || (use_menu && ask))\r
+                       {\r
+                               /* Show the list */\r
+                               if (!redraw || use_menu)\r
+                               {\r
+                                       byte y = 1, x = 0;\r
+                                       PET_COMMAND_IDX ctr = 0;\r
+\r
+                                       /* Show list */\r
+                                       redraw = TRUE;\r
+\r
+                                       /* Save the screen */\r
+                                       if (!use_menu) screen_save();\r
+\r
+                                       prt("", y++, x);\r
+\r
+                                       /* Print list */\r
+                                       for (ctr = 0; ctr < num; ctr++)\r
+                                       {\r
+                                               /* Letter/number for power selection */\r
+                                               if (use_menu)\r
+                                                       sprintf(buf, "%c%s ", (ctr == mode) ? '*' : ' ', (ctr == (menu_line - 1)) ? _("\81t", "> ") : "  ");\r
+                                               else\r
+                                                       sprintf(buf, "%c%c) ", (ctr == mode) ? '*' : ' ', I2A(ctr));\r
+\r
+                                               strcat(buf, power_desc[ctr]);\r
+\r
+                                               prt(buf, y + ctr, x);\r
+                                       }\r
+\r
+                                       prt("", y + MIN(ctr, 17), x);\r
+                               }\r
+\r
+                               /* Hide the list */\r
+                               else\r
+                               {\r
+                                       /* Hide list */\r
+                                       redraw = FALSE;\r
+\r
+                                       /* Restore the screen */\r
+                                       screen_load();\r
+                               }\r
+\r
+                               /* Redo asking */\r
+                               continue;\r
+                       }\r
+\r
+                       if (!use_menu)\r
+                       {\r
+                               /* Note verify */\r
+                               ask = (isupper(choice));\r
+\r
+                               /* Lowercase */\r
+                               if (ask) choice = (char)tolower(choice);\r
+\r
+                               /* Extract request */\r
+                               i = (islower(choice) ? A2I(choice) : -1);\r
+                       }\r
+\r
+                       /* Totally Illegal */\r
+                       if ((i < 0) || (i >= num))\r
+                       {\r
+                               bell();\r
+                               continue;\r
+                       }\r
+\r
+                       /* Verify it */\r
+                       if (ask)\r
+                       {\r
+                               /* Prompt */\r
+                               strnfmt(buf, 78, _("%s\82ð\8eg\82¢\82Ü\82·\82©\81H ", "Use %s? "), power_desc[i]);\r
+\r
+                               /* Belay that order */\r
+                               if (!get_check(buf)) continue;\r
+                       }\r
+\r
+                       /* Stop the loop */\r
+                       flag = TRUE;\r
+               }\r
+\r
+               /* Restore the screen */\r
+               if (redraw) screen_load();\r
+\r
+               /* Abort if needed */\r
+               if (!flag)\r
+               {\r
+                       p_ptr->energy_use = 0;\r
+                       return;\r
+               }\r
+\r
+#ifdef ALLOW_REPEAT\r
+               repeat_push(i);\r
+       }\r
+#endif /* ALLOW_REPEAT */\r
+\r
+       switch (powers[i])\r
+       {\r
+       case PET_DISMISS: /* Dismiss pets */\r
+       {\r
+               /* Check pets (backwards) */\r
+               for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)\r
+               {\r
+                       /* Player has pet */\r
+                       if (is_pet(&m_list[pet_ctr])) break;\r
+               }\r
+\r
+               if (!pet_ctr)\r
+               {\r
+                       msg_print(_("\83y\83b\83g\82ª\82¢\82È\82¢\81I", "You have no pets!"));\r
+                       break;\r
+               }\r
+               do_cmd_pet_dismiss();\r
+               (void)calculate_upkeep();\r
+               break;\r
+       }\r
+       case PET_TARGET:\r
+       {\r
+               project_length = -1;\r
+               if (!target_set(TARGET_KILL)) pet_t_m_idx = 0;\r
+               else\r
+               {\r
+                       cave_type *c_ptr = &cave[target_row][target_col];\r
+                       if (c_ptr->m_idx && (m_list[c_ptr->m_idx].ml))\r
+                       {\r
+                               pet_t_m_idx = cave[target_row][target_col].m_idx;\r
+                               p_ptr->pet_follow_distance = PET_DESTROY_DIST;\r
+                       }\r
+                       else pet_t_m_idx = 0;\r
+               }\r
+               project_length = 0;\r
+\r
+               break;\r
+       }\r
+       /* Call pets */\r
+       case PET_STAY_CLOSE:\r
+       {\r
+               p_ptr->pet_follow_distance = PET_CLOSE_DIST;\r
+               pet_t_m_idx = 0;\r
+               break;\r
+       }\r
+       /* "Follow Me" */\r
+       case PET_FOLLOW_ME:\r
+       {\r
+               p_ptr->pet_follow_distance = PET_FOLLOW_DIST;\r
+               pet_t_m_idx = 0;\r
+               break;\r
+       }\r
+       /* "Seek and destoy" */\r
+       case PET_SEEK_AND_DESTROY:\r
+       {\r
+               p_ptr->pet_follow_distance = PET_DESTROY_DIST;\r
+               break;\r
+       }\r
+       /* "Give me space" */\r
+       case PET_ALLOW_SPACE:\r
+       {\r
+               p_ptr->pet_follow_distance = PET_SPACE_DIST;\r
+               break;\r
+       }\r
+       /* "Stay away" */\r
+       case PET_STAY_AWAY:\r
+       {\r
+               p_ptr->pet_follow_distance = PET_AWAY_DIST;\r
+               break;\r
+       }\r
+       /* flag - allow pets to open doors */\r
+       case PET_OPEN_DOORS:\r
+       {\r
+               if (p_ptr->pet_extra_flags & PF_OPEN_DOORS) p_ptr->pet_extra_flags &= ~(PF_OPEN_DOORS);\r
+               else p_ptr->pet_extra_flags |= (PF_OPEN_DOORS);\r
+               break;\r
+       }\r
+       /* flag - allow pets to pickup items */\r
+       case PET_TAKE_ITEMS:\r
+       {\r
+               if (p_ptr->pet_extra_flags & PF_PICKUP_ITEMS)\r
+               {\r
+                       p_ptr->pet_extra_flags &= ~(PF_PICKUP_ITEMS);\r
+                       for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--)\r
+                       {\r
+                               /* Access the monster */\r
+                               m_ptr = &m_list[pet_ctr];\r
+\r
+                               if (is_pet(m_ptr))\r
+                               {\r
+                                       monster_drop_carried_objects(m_ptr);\r
+                               }\r
+                       }\r
+               }\r
+               else p_ptr->pet_extra_flags |= (PF_PICKUP_ITEMS);\r
+\r
+               break;\r
+       }\r
+       /* flag - allow pets to teleport */\r
+       case PET_TELEPORT:\r
+       {\r
+               if (p_ptr->pet_extra_flags & PF_TELEPORT) p_ptr->pet_extra_flags &= ~(PF_TELEPORT);\r
+               else p_ptr->pet_extra_flags |= (PF_TELEPORT);\r
+               break;\r
+       }\r
+       /* flag - allow pets to cast attack spell */\r
+       case PET_ATTACK_SPELL:\r
+       {\r
+               if (p_ptr->pet_extra_flags & PF_ATTACK_SPELL) p_ptr->pet_extra_flags &= ~(PF_ATTACK_SPELL);\r
+               else p_ptr->pet_extra_flags |= (PF_ATTACK_SPELL);\r
+               break;\r
+       }\r
+       /* flag - allow pets to cast attack spell */\r
+       case PET_SUMMON_SPELL:\r
+       {\r
+               if (p_ptr->pet_extra_flags & PF_SUMMON_SPELL) p_ptr->pet_extra_flags &= ~(PF_SUMMON_SPELL);\r
+               else p_ptr->pet_extra_flags |= (PF_SUMMON_SPELL);\r
+               break;\r
+       }\r
+       /* flag - allow pets to cast attack spell */\r
+       case PET_BALL_SPELL:\r
+       {\r
+               if (p_ptr->pet_extra_flags & PF_BALL_SPELL) p_ptr->pet_extra_flags &= ~(PF_BALL_SPELL);\r
+               else p_ptr->pet_extra_flags |= (PF_BALL_SPELL);\r
+               break;\r
+       }\r
+\r
+       case PET_RIDING:\r
+       {\r
+               (void)do_riding(FALSE);\r
+               break;\r
+       }\r
+\r
+       case PET_NAME:\r
+       {\r
+               do_name_pet();\r
+               break;\r
+       }\r
+\r
+       case PET_RYOUTE:\r
+       {\r
+               if (p_ptr->pet_extra_flags & PF_RYOUTE) p_ptr->pet_extra_flags &= ~(PF_RYOUTE);\r
+               else p_ptr->pet_extra_flags |= (PF_RYOUTE);\r
+               p_ptr->update |= (PU_BONUS);\r
+               handle_stuff();\r
+               break;\r
+       }\r
+       }\r
+}\r
+\r
+\r
+/*!\r
+* @brief \83y\83b\83g\82Ì\91P\88«\91®\90«\82É\89\9e\82\82½\88Û\8e\9d\83R\83X\83g\82Ì\93r\92\86\8cv\8eZ\8f\88\97\9d\r
+* @param m_ptr \8cv\8eZ\8aî\8f\80\82Æ\82È\82é\83\82\83\93\83X\83^\81[\82Ì\8d\\91¢\91Ì\8eQ\8fÆ\83|\83C\83\93\83^\r
+* @param inc m_ptr\82Å\8ew\92è\82µ\82½\83\82\83\93\83X\83^\81[\82ð\88Û\8e\9d\83R\83X\83g\8cv\8eZ\82É\89Á\82¦\82é\82È\82çTRUE\81A\8aO\82·\82È\82çFALSE\82ð\8ew\92è\r
+* @return \82È\82µ\r
+*/\r
+void check_pets_num_and_align(monster_type *m_ptr, bool inc)\r
+{\r
+       s32b old_friend_align = friend_align;\r
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];\r
+\r
+       if (inc)\r
+       {\r
+               total_friends++;\r
+               if (r_ptr->flags3 & RF3_GOOD) friend_align += r_ptr->level;\r
+               if (r_ptr->flags3 & RF3_EVIL) friend_align -= r_ptr->level;\r
+       }\r
+       else\r
+       {\r
+               total_friends--;\r
+               if (r_ptr->flags3 & RF3_GOOD) friend_align -= r_ptr->level;\r
+               if (r_ptr->flags3 & RF3_EVIL) friend_align += r_ptr->level;\r
+       }\r
+\r
+       if (old_friend_align != friend_align) p_ptr->update |= (PU_BONUS);\r
+}\r
+\r
+\r
+\r
+/*!\r
+* @brief \83v\83\8c\83C\83\84\81[\82Ì\97\8e\94n\94»\92è\8f\88\97\9d\r
+* @param dam \97\8e\94n\94»\92è\82ð\94­\82µ\82½\8dÛ\82É\8eó\82¯\82½\83_\83\81\81[\83W\97Ê\r
+* @param force TRUE\82È\82ç\82Î\8b­\90§\93I\82É\97\8e\94n\82·\82é\r
+* @return \8eÀ\8dÛ\82É\97\8e\94n\82µ\82½\82çTRUE\82ð\95Ô\82·\r
+*/\r
+bool rakuba(HIT_POINT dam, bool force)\r
+{\r
+       int i, y, x, oy, ox;\r
+       int sn = 0, sy = 0, sx = 0;\r
+       char m_name[80];\r
+       monster_type *m_ptr = &m_list[p_ptr->riding];\r
+       monster_race *r_ptr = &r_info[m_ptr->r_idx];\r
+       bool fall_dam = FALSE;\r
+\r
+       if (!p_ptr->riding) return FALSE;\r
+       if (p_ptr->wild_mode) return FALSE;\r
+\r
+       if (dam >= 0 || force)\r
+       {\r
+               if (!force)\r
+               {\r
+                       int cur = p_ptr->skill_exp[GINOU_RIDING];\r
+                       int max = s_info[p_ptr->pclass].s_max[GINOU_RIDING];\r
+                       int ridinglevel = r_ptr->level;\r
+\r
+                       /* \97\8e\94n\82Ì\82µ\82â\82·\82³ */\r
+                       int rakubalevel = r_ptr->level;\r
+                       if (p_ptr->riding_ryoute) rakubalevel += 20;\r
+\r
+                       if ((cur < max) && (max > 1000) &&\r
+                               (dam / 2 + ridinglevel) > (cur / 30 + 10))\r
+                       {\r
+                               int inc = 0;\r
+\r
+                               if (ridinglevel > (cur / 100 + 15))\r
+                                       inc += 1 + (ridinglevel - cur / 100 - 15);\r
+                               else\r
+                                       inc += 1;\r
+\r
+                               p_ptr->skill_exp[GINOU_RIDING] = MIN(max, cur + inc);\r
+                       }\r
+\r
+                       /* \83\8c\83x\83\8b\82Ì\92á\82¢\8fæ\94n\82©\82ç\82Í\97\8e\94n\82µ\82É\82­\82¢ */\r
+                       if (randint0(dam / 2 + rakubalevel * 2) < cur / 30 + 10)\r
+                       {\r
+                               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))\r
+                               {\r
+                                       return FALSE;\r
+                               }\r
+                       }\r
+               }\r
+\r
+               /* Check around the player */\r
+               for (i = 0; i < 8; i++)\r
+               {\r
+                       cave_type *c_ptr;\r
+\r
+                       /* Access the location */\r
+                       y = p_ptr->y + ddy_ddd[i];\r
+                       x = p_ptr->x + ddx_ddd[i];\r
+\r
+                       c_ptr = &cave[y][x];\r
+\r
+                       if (c_ptr->m_idx) continue;\r
+\r
+                       /* Skip non-empty grids */\r
+                       if (!cave_have_flag_grid(c_ptr, FF_MOVE) && !cave_have_flag_grid(c_ptr, FF_CAN_FLY))\r
+                       {\r
+                               if (!player_can_ride_aux(c_ptr, FALSE)) continue;\r
+                       }\r
+\r
+                       if (cave_have_flag_grid(c_ptr, FF_PATTERN)) continue;\r
+\r
+                       /* Count "safe" grids */\r
+                       sn++;\r
+\r
+                       /* Randomize choice */\r
+                       if (randint0(sn) > 0) continue;\r
+\r
+                       /* Save the safe location */\r
+                       sy = y; sx = x;\r
+               }\r
+               if (!sn)\r
+               {\r
+                       monster_desc(m_name, m_ptr, 0);\r
+#ifdef JP\r
+                       msg_format("%s\82©\82ç\90U\82è\97\8e\82Æ\82³\82ê\82»\82¤\82É\82È\82Á\82Ä\81A\95Ç\82É\82Ô\82Â\82©\82Á\82½\81B", m_name);\r
+                       take_hit(DAMAGE_NOESCAPE, r_ptr->level + 3, "\95Ç\82Ö\82Ì\8fÕ\93Ë", -1);\r
+#else\r
+                       msg_format("You have nearly fallen from %s, but bumped into wall.", m_name);\r
+                       take_hit(DAMAGE_NOESCAPE, r_ptr->level + 3, "bumping into wall", -1);\r
+#endif\r
+                       return FALSE;\r
+               }\r
+\r
+               oy = p_ptr->y;\r
+               ox = p_ptr->x;\r
+\r
+               p_ptr->y = sy;\r
+               p_ptr->x = sx;\r
+\r
+               /* Redraw the old spot */\r
+               lite_spot(oy, ox);\r
+\r
+               /* Redraw the new spot */\r
+               lite_spot(p_ptr->y, p_ptr->x);\r
+\r
+               /* Check for new panel */\r
+               verify_panel();\r
+       }\r
+\r
+       p_ptr->riding = 0;\r
+       p_ptr->pet_extra_flags &= ~(PF_RYOUTE);\r
+       p_ptr->riding_ryoute = p_ptr->old_riding_ryoute = FALSE;\r
+\r
+       calc_bonuses();\r
+\r
+       p_ptr->update |= (PU_BONUS);\r
+\r
+       /* Update stuff */\r
+       p_ptr->update |= (PU_VIEW | PU_LITE | PU_FLOW | PU_MON_LITE | PU_MONSTERS);\r
+\r
+       /* Window stuff */\r
+       p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);\r
+\r
+       p_ptr->redraw |= (PR_EXTRA);\r
+\r
+       /* Update health track of mount */\r
+       p_ptr->redraw |= (PR_UHEALTH);\r
+\r
+       if (p_ptr->levitation && !force)\r
+       {\r
+               monster_desc(m_name, m_ptr, 0);\r
+               msg_format(_("%s\82©\82ç\97\8e\82¿\82½\82ª\81A\8bó\92\86\82Å\82¤\82Ü\82­\91Ì\90¨\82ð\97§\82Ä\92¼\82µ\82Ä\92\85\92n\82µ\82½\81B", "You are thrown from %s, but make a good landing."), m_name);\r
+       }\r
+       else\r
+       {\r
+               take_hit(DAMAGE_NOESCAPE, r_ptr->level + 3, _("\97\8e\94n", "Falling from riding"), -1);\r
+               fall_dam = TRUE;\r
+       }\r
+\r
+       /* Move the player */\r
+       if (sy && !p_ptr->is_dead)\r
+               (void)move_player_effect(p_ptr->y, p_ptr->x, MPE_DONT_PICKUP | MPE_DONT_SWAP_MON);\r
+\r
+       return fall_dam;\r
+}\r
+\r
diff --git a/src/cmd-pet.h b/src/cmd-pet.h
new file mode 100644 (file)
index 0000000..599ea3e
--- /dev/null
@@ -0,0 +1,9 @@
+extern bool do_riding(bool force);\r
+extern void check_pets_num_and_align(monster_type *m_ptr, bool inc);\r
+extern int calculate_upkeep(void);\r
+extern void do_cmd_pet_dismiss(void);\r
+extern void do_cmd_pet(void);\r
+extern bool player_can_ride_aux(cave_type *c_ptr, bool now_riding);\r
+extern bool rakuba(HIT_POINT dam, bool force);\r
+\r
+\r
index 0e521e6..5c6fc97 100644 (file)
@@ -40,7 +40,7 @@
  */
 
 #include "angband.h"
  */
 
 #include "angband.h"
-
+#include "cmd-pet.h"
 
 
 /*
 
 
 /*
index a490e81..6f25b15 100644 (file)
@@ -749,14 +749,7 @@ void do_cmd_study(void)
        if (mp_ptr->spell_book != TV_LIFE_BOOK)
        {
                /* Ask for a spell, allow cancel */
        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 */
        }
 
        /* Priest -- Learn a random prayer */
@@ -911,21 +904,7 @@ void do_cmd_study(void)
 
        /* One less spell available */
        p_ptr->learned_spells++;
 
        /* 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();
        /* Update Study */
        p_ptr->update |= (PU_SPELLS);
        update_stuff();
@@ -1109,8 +1088,8 @@ void do_cmd_cast(void)
 
                /* Warning */
 #ifdef JP
 
                /* 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"),
 #else
                msg_format("You do not have enough mana to %s this %s.",
                        ((mp_ptr->spell_book == TV_LIFE_BOOK) ? "recite" : "cast"),
@@ -1403,1197 +1382,3 @@ msg_format("その%sを%sのに十分なマジックポイントがない。",pr
        p_ptr->window |= (PW_PLAYER);
        p_ptr->window |= (PW_SPELL);
 }
        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;
-       MONSTER_IDX 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;
-       MONSTER_IDX pet_ctr;
-       int i;
-       int Dismissed = 0;
-
-       MONSTER_IDX *who;
-       u16b dummy_why;
-       int max_pet = 0;
-       bool_hack 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, MONSTER_IDX);
-
-       /* 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, MONSTER_IDX);
-
-#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;
-       MONSTER_IDX 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(HIT_POINT 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)
-{
-       COMMAND_CODE 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;
-
-       PET_COMMAND_IDX 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;
-                               PET_COMMAND_IDX 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 = (char)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;
-               }
-       }
-}
index f95e2a5..3e854ce 100644 (file)
@@ -19,6 +19,7 @@
 #include "cmd-usestaff.h"
 #include "cmd-zaprod.h"
 #include "cmd-zapwand.h"
 #include "cmd-usestaff.h"
 #include "cmd-zaprod.h"
 #include "cmd-zapwand.h"
+#include "cmd-pet.h"
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ(広域マップ1マス毎に20回処理を基本とする)*/
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ(広域マップ1マス毎に20回処理を基本とする)*/
index d8b790b..1b66d0a 100644 (file)
@@ -12,7 +12,6 @@
  * 2013 Deskull rearranged comment for Doxygen.\n
  */
 
  * 2013 Deskull rearranged comment for Doxygen.\n
  */
 
-
 #include "angband.h"
 
 /*!
 #include "angband.h"
 
 /*!
@@ -5205,3 +5204,4 @@ bool choose_ele_immune(TIME_EFFECT immune_turn)
        screen_load();
        return TRUE;
 }
        screen_load();
        return TRUE;
 }
+
index 7a019e2..ab267ce 100644 (file)
@@ -796,12 +796,6 @@ extern cptr spell_category_name(OBJECT_TYPE_VALUE tval);
 extern void do_cmd_browse(void);
 extern void do_cmd_study(void);
 extern void do_cmd_cast(void);
 extern void do_cmd_browse(void);
 extern void do_cmd_study(void);
 extern void do_cmd_cast(void);
-extern bool rakuba(HIT_POINT dam, bool force);
-extern bool do_riding(bool force);
-extern void check_pets_num_and_align(monster_type *m_ptr, bool inc);
-extern int calculate_upkeep(void);
-extern void do_cmd_pet_dismiss(void);
-extern void do_cmd_pet(void);
 
 /* cmd-spell.c */
 extern void stop_singing(void);
 
 /* cmd-spell.c */
 extern void stop_singing(void);
index 74a6e38..d8c6888 100644 (file)
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
 
 
 /*!
 
 
 /*!
index f7b0d36..e48c48a 100644 (file)
@@ -14,6 +14,7 @@
  */
 
 #include "angband.h"
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
 
 
 /*!
 
 
 /*!
index 31d91b9..449d082 100644 (file)
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
 
 
 /*
 
 
 /*
index a772745..813b656 100644 (file)
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する? */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する? */
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する? */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する? */
index 0a68687..5c5d28a 100644 (file)
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "cmd-magiceat.h"
 #include "cmd-zapwand.h"
 #include "angband.h"
 #include "cmd-magiceat.h"
 #include "cmd-zapwand.h"
+#include "cmd-pet.h"
 
 /*!
  * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/
 
 /*!
  * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/
index e35cf96..e5c0396 100644 (file)
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
index b785944..5f6ce90 100644 (file)
@@ -12,6 +12,7 @@
 
 
 #include "angband.h"
 
 
 #include "angband.h"
+#include "cmd-pet.h"
 
 #define REWARD_CHANCE 10
 
 
 #define REWARD_CHANCE 10