変数total_friend_levelsはペット維持計算にしか用いられないため, グロー

バル変数からcalculate_upkeep()のみの変数に変更.

diff --git a/src/cmd5.c b/src/cmd5.c
index bf57b46..e7f0e20 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -1634,9 +1634,9 @@ int calculate_upkeep(void)
        s32b old_friend_align = friend_align;
        int m_idx;
        bool have_a_unique = FALSE;
+       s32b total_friend_levels = 0;
 
        total_friends = 0;
-       total_friend_levels = 0;
        friend_align = 0;
 
        for (m_idx = m_max - 1; m_idx >=1; m_idx--)

diff --git a/src/externs.h b/src/externs.h
index 894e76d..59cb1e7 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -197,7 +197,6 @@ extern s16b m_cnt;
 extern s16b hack_m_idx;
 extern s16b hack_m_idx_ii;
 extern int total_friends;
-extern s32b total_friend_levels;
 extern s32b friend_align;
 extern int leaving_quest;
 extern bool reinit_wilderness;

diff --git a/src/variable.c b/src/variable.c
index 6595b82..79023d3 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -166,7 +166,6 @@ bool multi_rew = FALSE;
 char summon_kin_type;   /* Hack, by Julian Lighton: summon 'relatives' */
 
 int total_friends = 0;
-s32b total_friend_levels = 0;
 s32b friend_align = 0;
 
 int leaving_quest = 0;