[Refactor] #37353 item_tester_learn_spell() を object-hook.c へ移動。 / Move item_tester_l...

[hengband/hengband.git] / src / cmd-pet.c

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 61f8e61..82dbc77 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -1,5 +1,7 @@
 #include "angband.h"
 #include "melee.h"
+#include "sort.h"
+#include "player-status.h"
 
 /*!
 * @brief プレイヤーの騎乗/下馬処理判定
@@ -511,7 +513,7 @@ void do_cmd_pet(void)
        COMMAND_CODE i = 0;
        int                     num;
        int                     powers[36];
-       cptr                    power_desc[36];
+       concptr                 power_desc[36];
        bool                    flag, redraw;
        char                    choice;
        char                    out_val[160];
@@ -527,6 +529,8 @@ void do_cmd_pet(void)
 
        num = 0;
 
+       if(p_ptr->wild_mode) return;
+
        power_desc[num] = _("ペットを放す", "dismiss pets");
        powers[num++] = PET_DISMISS;
 
@@ -670,7 +674,7 @@ void do_cmd_pet(void)
 
                                        powers[num++] = PET_RYOUTE;
                                }
-                               else if ((empty_hands(FALSE) != EMPTY_HAND_NONE) && !buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))
+                               else if ((empty_hands(FALSE) != EMPTY_HAND_NONE) && !has_melee_weapon(INVEN_RARM) && !has_melee_weapon(INVEN_LARM))
                                {
                                        if (p_ptr->pet_extra_flags & PF_RYOUTE)
                                        {
@@ -1147,7 +1151,6 @@ bool rakuba(HIT_POINT dam, bool force)
 
 
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
        p_ptr->redraw |= (PR_EXTRA);
 
        /* Update health track of mount */