[Refactor] #37353 total_friends を cmd-pet.c/h に移動．

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index d033d7a..cfb2097 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -20,6 +20,8 @@
 #include "targeting.h"
 #include "world.h"
 
+int total_friends = 0;
+
 /*!
 * @brief プレイヤーの騎乗/下馬処理判定
 * @param g_ptr プレイヤーの移動先マスの構造体参照ポインタ

diff --git a/src/cmd-pet.h b/src/cmd-pet.h
index 5e31dc4..cf09403 100644 (file)
--- a/src/cmd-pet.h
+++ b/src/cmd-pet.h
@@ -8,6 +8,8 @@ extern void do_cmd_pet(void);
 extern bool player_can_ride_aux(grid_type *g_ptr, bool now_riding);
 extern bool rakuba(HIT_POINT dam, bool force);
 
+extern int total_friends;
+
 /*** Pet constants ***/
 
 

diff --git a/src/externs.h b/src/externs.h
index 2c12b07..777bbaf 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -56,7 +56,6 @@ extern s16b command_new;
 
 extern bool repair_monsters;
 extern bool repair_objects;
-extern int total_friends;
 
 extern bool reset_concent;
 

diff --git a/src/variable.c b/src/variable.c
index e4f227f..e202f71 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -29,7 +29,6 @@ s16b command_new;             /* Command chaining from inven/equip view */
 bool repair_monsters;  /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */
 
-int total_friends = 0;
 
 /*
  * Dungeon size info