[Refactor] #37353 is_open() を cave.c へ移動。 / Move is_open() to cave.c.

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

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 2d0bd7c..c9bb312 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 プレイヤーの騎乗/下馬処理判定
@@ -418,7 +420,6 @@ bool do_riding(bool force)
        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;
@@ -511,7 +512,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];
@@ -672,7 +673,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)
                                        {
@@ -1149,7 +1150,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 */
@@ -1166,7 +1166,6 @@ bool rakuba(HIT_POINT dam, bool force)
                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);