From 0b91ce84da611b294a11dcb49697bd79280fcdd0 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Fri, 19 Apr 2019 08:07:53 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E9=96=A2=E6=95=B0?=
 =?utf8?q?=E5=AE=A3=E8=A8=80=E3=81=AE=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B?=
 =?utf8?q?=E3=82=92=20floor-save.h=E3=80=80=E3=81=B8=E7=A7=BB=E5=8B=95?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/bldg.c           | 1 +
 src/cmd-basic.c      | 1 +
 src/externs.h        | 6 ------
 src/floor-generate.c | 1 +
 src/floor-save.h     | 5 +++++
 src/quest.c          | 1 +
 src/save.c           | 1 +
 src/spells-floor.c   | 1 +
 src/spells3.c        | 1 +
 src/trap.c           | 1 +
 10 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/bldg.c b/src/bldg.c
index c75a9b5f2..4346c140c 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -15,6 +15,7 @@
 #include "angband.h"
 #include "floor.h"
 #include "floor-events.h"
+#include "floor-save.h"
 #include "object-boost.h"
 #include "object-flavor.h"
 #include "object-hook.h"
diff --git a/src/cmd-basic.c b/src/cmd-basic.c
index 775e3830d..c235afc6e 100644
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -34,6 +34,7 @@
 #include "shoot.h"
 
 #include "cmd-basic.h"
+#include "floor-save.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理
diff --git a/src/externs.h b/src/externs.h
index 076ad7118..fbddccf84 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -522,12 +522,6 @@ extern errr get_rnd_line_jonly(concptr file_name, int entry, char *output, int c
 extern errr counts_write(int where, u32b count);
 extern u32b counts_read(int where);
 
-/* floors.c */
-extern void clear_saved_floor_files(void);
-extern saved_floor_type *get_sf_ptr(FLOOR_IDX floor_id);
-extern FLOOR_IDX get_new_floor_id(void);
-extern void prepare_change_floor_mode(BIT_FLAGS mode);
-extern void precalc_cur_num_of_pet(void);
 
 /* init1.c */
 extern TERM_COLOR color_char_to_attr(SYMBOL_CODE c);
diff --git a/src/floor-generate.c b/src/floor-generate.c
index 9fd09d14f..d07e84d76 100644
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -101,6 +101,7 @@
 #include "grid.h"
 #include "rooms.h"
 #include "floor.h"
+#include "floor-save.h"
 #include "floor-streams.h"
 #include "floor-generate.h"
 #include "floor-events.h"
diff --git a/src/floor-save.h b/src/floor-save.h
index 24a6e1828..6e2bf06f8 100644
--- a/src/floor-save.h
+++ b/src/floor-save.h
@@ -3,3 +3,8 @@
 extern void init_saved_floors(bool force);
 extern void change_floor(void);
 extern void leave_floor(void);
+extern void clear_saved_floor_files(void);
+extern saved_floor_type *get_sf_ptr(FLOOR_IDX floor_id);
+extern FLOOR_IDX get_new_floor_id(void);
+extern void prepare_change_floor_mode(BIT_FLAGS mode);
+extern void precalc_cur_num_of_pet(void);
diff --git a/src/quest.c b/src/quest.c
index 73dcee0dc..751c879e2 100644
--- a/src/quest.c
+++ b/src/quest.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "floor.h"
+#include "floor-save.h"
 #include "floor-events.h"
 #include "grid.h"
 #include "quest.h"
diff --git a/src/save.c b/src/save.c
index d9c37eb44..0376a8df7 100644
--- a/src/save.c
+++ b/src/save.c
@@ -17,6 +17,7 @@
 #include "store.h"
 #include "wild.h"
 #include "floor-events.h"
+#include "floor-save.h"
 
 
 
diff --git a/src/spells-floor.c b/src/spells-floor.c
index 228c526a4..6b3b76eda 100644
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -4,6 +4,7 @@
 #include "grid.h"
 #include "quest.h"
 #include "cmd-basic.h"
+#include "floor-save.h"
 
 /*
  * Light up the dungeon using "clairvoyance"
diff --git a/src/spells3.c b/src/spells3.c
index 13a5f9a0d..bec3c0bd5 100644
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -30,6 +30,7 @@
 #include "monster-spell.h"
 #include "cmd-spell.h"
 #include "snipe.h"
+#include "floor-save.h"
 
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */
diff --git a/src/trap.c b/src/trap.c
index d6df25b41..5d761046c 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -10,6 +10,7 @@
 #include "player-status.h"
 #include "grid.h"
 #include "spells.h"
+#include "floor-save.h"
 
 static s16b normal_traps[MAX_NORMAL_TRAPS];
 
-- 
2.11.0