[Refactor] #37353 空白整理。 / Refactor spaces.

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

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index d74baff..82dbc77 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -1,4 +1,7 @@
 #include "angband.h"
+#include "melee.h"
+#include "sort.h"
+#include "player-status.h"
 
 /*!
 * @brief プレイヤーの騎乗/下馬処理判定
@@ -195,7 +198,7 @@ void do_cmd_pet_dismiss(void)
        for (i = 0; i < max_pet; i++)
        {
                bool delete_this;
-               char friend_name[80];
+               GAME_TEXT friend_name[MAX_NLEN];
                bool kakunin;
 
                /* Access the monster */
@@ -252,7 +255,7 @@ void do_cmd_pet_dismiss(void)
                {
                        if (record_named_pet && m_ptr->nickname)
                        {
-                               char m_name[80];
+                               GAME_TEXT m_name[MAX_NLEN];
 
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_DISMISS, m_name);
@@ -395,7 +398,7 @@ bool do_riding(bool force)
 
                if (MON_CSLEEP(m_ptr))
                {
-                       char m_name[80];
+                       GAME_TEXT m_name[MAX_NLEN];
                        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);
@@ -431,7 +434,7 @@ static void do_name_pet(void)
 {
        monster_type *m_ptr;
        char out_val[20];
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
        bool old_name = FALSE;
        bool old_target_pet = target_pet;
 
@@ -510,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];
@@ -526,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;
 
@@ -669,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)
                                        {
@@ -800,8 +805,6 @@ void do_cmd_pet(void)
                                {
                                        /* Hide list */
                                        redraw = FALSE;
-
-                                       /* Restore the screen */
                                        screen_load();
                                }
 
@@ -841,8 +844,6 @@ void do_cmd_pet(void)
                        /* Stop the loop */
                        flag = TRUE;
                }
-
-               /* Restore the screen */
                if (redraw) screen_load();
 
                /* Abort if needed */
@@ -1044,7 +1045,7 @@ bool rakuba(HIT_POINT dam, bool force)
 {
        int i, y, x, oy, ox;
        int sn = 0, sy = 0, sx = 0;
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
        monster_type *m_ptr = &m_list[p_ptr->riding];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
        bool fall_dam = FALSE;
@@ -1150,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 */