[Refactor] #37353 関数宣言のいくつかを floor-save.h へ移動。

diff --git a/src/bldg.c b/src/bldg.c
index c75a9b5..4346c14 100644 (file)
--- 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 775e383..c235afc 100644 (file)
--- 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 076ad71..fbddccf 100644 (file)
--- 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 9fd09d1..d07e84d 100644 (file)
--- 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 24a6e18..6e2bf06 100644 (file)
--- 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 73dcee0..751c879 100644 (file)
--- 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 d9c37eb..0376a8d 100644 (file)
--- 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 228c526..6b3b76e 100644 (file)
--- 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 13a5f9a..bec3c0b 100644 (file)
--- 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 d6df25b..5d76104 100644 (file)
--- 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];