[Refactor] #39073 Delete friend_align and check_pets_num_and_align().

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 4020418..6c429be 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -57,13 +57,11 @@ bool player_can_ride_aux(grid_type *g_ptr, bool now_riding)
 */
 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--)
        {
@@ -95,12 +93,9 @@ int calculate_upkeep(void)
                        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;
@@ -953,35 +948,6 @@ void do_cmd_pet(void)
 
 
 /*!
-* @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 プレイヤーの落馬判定処理
 * @param dam 落馬判定を発した際に受けたダメージ量
 * @param force TRUEならば強制的に落馬する

diff --git a/src/cmd-pet.h b/src/cmd-pet.h
index f967ab0..2623647 100644 (file)
--- a/src/cmd-pet.h
+++ b/src/cmd-pet.h
@@ -1,5 +1,4 @@
 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);

diff --git a/src/externs.h b/src/externs.h
index 31fa38b..b4cef77 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -182,7 +182,6 @@ extern MONSTER_IDX m_cnt;
 extern MONSTER_IDX hack_m_idx;
 extern MONSTER_IDX hack_m_idx_ii;
 extern int total_friends;
-extern s32b friend_align;
 extern int leaving_quest;
 extern bool reinit_wilderness;
 extern bool multi_rew;

diff --git a/src/monster1.c b/src/monster1.c
index a7b1449..a6fbf4e 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -2221,8 +2221,6 @@ void set_friendly(monster_type *m_ptr)
  */
 void set_pet(monster_type *m_ptr)
 {
-       if (!is_pet(m_ptr)) check_pets_num_and_align(m_ptr, TRUE);
-
        /* Check for quest completion */
        check_quest_completion(m_ptr);
 
@@ -2240,9 +2238,6 @@ void set_pet(monster_type *m_ptr)
 void set_hostile(monster_type *m_ptr)
 {
        if (p_ptr->inside_battle) return;
-
-       if (is_pet(m_ptr)) check_pets_num_and_align(m_ptr, FALSE);
-
        m_ptr->smart &= ~SM_PET;
        m_ptr->smart &= ~SM_FRIENDLY;
 }

diff --git a/src/monster2.c b/src/monster2.c
index 84d8157..35d56fa 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -287,8 +287,6 @@ void delete_monster_idx(MONSTER_IDX i)
                delete_object_idx(this_o_idx);
        }
 
-       if (is_pet(m_ptr)) check_pets_num_and_align(m_ptr, FALSE);
-
        (void)WIPE(m_ptr, monster_type);
 
        /* Count monsters */
@@ -2456,8 +2454,6 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
                if (!r_idx) return;
        }
 
-       if (is_pet(m_ptr)) check_pets_num_and_align(m_ptr, FALSE);
-
        m_ptr->r_idx = r_idx;
        m_ptr->ap_r_idx = r_idx;
        update_monster(m_idx, FALSE);
@@ -2467,8 +2463,6 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
            (r_ptr->flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)))
                p_ptr->update |= (PU_MON_LITE);
 
-       if (is_pet(m_ptr)) check_pets_num_and_align(m_ptr, TRUE);
-
        if (born)
        {
                /* Sub-alignment of a chameleon */

diff --git a/src/player-status.c b/src/player-status.c
index 91b7863..59160a8 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -254,7 +254,7 @@ void calc_bonuses(void)
        p_ptr->hidarite = FALSE;
        p_ptr->no_flowed = FALSE;
 
-       p_ptr->align = friend_align;
+       p_ptr->align = 0;
 
        if (p_ptr->mimic_form) tmp_rp_ptr = &mimic_info[p_ptr->mimic_form];
        else tmp_rp_ptr = &race_info[p_ptr->prace];

diff --git a/src/variable.c b/src/variable.c
index b1dd694..a3142a2 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -157,8 +157,6 @@ bool multi_rew = FALSE;
 char summon_kin_type;   /* Hack, by Julian Lighton: summon 'relatives' */
 
 int total_friends = 0;
-s32b friend_align = 0;
-
 int leaving_quest = 0;
 bool reinit_wilderness = FALSE;