From ddf7c0f6fe2a64d97653c2d650c390eef293d441 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Tue, 11 Jun 2019 20:17:51 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20repair=5Fmonsters,=20repai?=
 =?utf8?q?r=5Fobjects=20=E3=82=92=20core.c/h=20=E3=81=B8=E7=A7=BB=E5=8B=95?=
 =?utf8?q?=EF=BC=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/core.c       | 3 +++
 src/core.h       | 3 +++
 src/externs.h    | 5 -----
 src/floor-save.c | 1 +
 src/monster2.c   | 1 +
 src/variable.c   | 3 ---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core.c b/src/core.c
index 235075e4e..1b559c4ba 100644
--- a/src/core.c
+++ b/src/core.c
@@ -105,6 +105,9 @@ bool can_save = FALSE;        /* Game can be saved */
 
 COMMAND_CODE now_message;
 
+bool repair_monsters;	/* Hack -- optimize detect monsters */
+bool repair_objects;	/* Hack -- optimize detect objects */
+
 concptr ANGBAND_SYS = "xxx"; //!< Hack -- The special Angband "System Suffix" This variable is used to choose an appropriate "pref-xxx" file
 
 #ifdef JP
diff --git a/src/core.h b/src/core.h
index 11fdc8e1c..36111629e 100644
--- a/src/core.h
+++ b/src/core.h
@@ -75,6 +75,9 @@ extern concptr ANGBAND_GRAF;
 extern bool can_save;
 extern COMMAND_CODE now_message;
 
+extern bool repair_monsters;
+extern bool repair_objects;
+
 extern void play_game(bool new_game);
 extern void update_playtime(void);
 extern s32b turn_real(s32b hoge);
diff --git a/src/externs.h b/src/externs.h
index 74f2037c7..b6bdcc12b 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -20,8 +20,3 @@
 #include "object.h"
 #include "player-status.h"
 
-
-/* variable.c */
-
-extern bool repair_monsters;
-extern bool repair_objects;
diff --git a/src/floor-save.c b/src/floor-save.c
index e870ffd7a..f8e1631b2 100644
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "bldg.h"
+#include "core.h"
 #include "load.h"
 #include "util.h"
 
diff --git a/src/monster2.c b/src/monster2.c
index 3228ed159..c32756e4d 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "core.h"
 
 #include "cmd-dump.h"
 #include "cmd-pet.h"
diff --git a/src/variable.c b/src/variable.c
index f2227b38a..4cefb7283 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -13,6 +13,3 @@
 #include "angband.h"
 #include "geometry.h"
 
-
-bool repair_monsters;	/* Hack -- optimize detect monsters */
-bool repair_objects;	/* Hack -- optimize detect objects */
-- 
2.11.0