[Refactor] #40569 Moved saved_floors[] from floor.c/h to floor-save.c/h

diff --git a/src/cmd-action/cmd-move.c b/src/cmd-action/cmd-move.c
index a90af12..398d40e 100644 (file)
--- a/src/cmd-action/cmd-move.c
+++ b/src/cmd-action/cmd-move.c
@@ -10,7 +10,7 @@
 #include "core/player-update-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
-#include "floor/floor.h"
+#include "floor/floor-save.h"
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
 #include "game-option/input-options.h"

diff --git a/src/floor/floor-save.c b/src/floor/floor-save.c
index 0bccfdf..6a2551c 100644 (file)
--- a/src/floor/floor-save.c
+++ b/src/floor/floor-save.c
@@ -83,6 +83,8 @@ FLOOR_IDX max_floor_id;
  */
 u32b saved_floor_file_sign;
 
+saved_floor_type saved_floors[MAX_SAVED_FLOORS];
+
 /*!
  * @brief 保存フロア配列を初期化する / Initialize saved_floors array.
  * @param creature_ptr プレーヤーへの参照ポインタ

diff --git a/src/floor/floor-save.h b/src/floor/floor-save.h
index e55c039..ccc9ae1 100644 (file)
--- a/src/floor/floor-save.h
+++ b/src/floor/floor-save.h
@@ -33,6 +33,7 @@ typedef struct saved_floor_type {
 
 extern u32b saved_floor_file_sign;
 extern bool repair_monsters;
+extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
 
 void init_saved_floors(player_type *creature_ptr, bool force);
 void change_floor(player_type *creature_ptr);

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 97ec455..6edc5ab 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -41,11 +41,6 @@
 floor_type floor_info;
 
 /*
- * The array of saved floors
- */
-saved_floor_type saved_floors[MAX_SAVED_FLOORS];
-
-/*
  * Grid based version of "cave_empty_bold()"
  */
 bool is_cave_empty_grid(player_type *player_ptr, grid_type *g_ptr)

diff --git a/src/floor/floor.h b/src/floor/floor.h
index d791129..b70f7c2 100644 (file)
--- a/src/floor/floor.h
+++ b/src/floor/floor.h
@@ -4,7 +4,6 @@
 #include "floor/sight-definitions.h"
 #include "monster/monster-timed-effect-types.h"
 #include "system/angband.h"
-#include "floor/floor-save.h"
 
 typedef struct grid_type grid_type;
 typedef struct object_type object_type;
@@ -236,8 +235,6 @@ extern floor_type floor_info;
        (have_flag((F)->flags, FF_WALL) && \
         have_flag((F)->flags, FF_PERMANENT))
 
-extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
-
 /*
  * Convert a "location" (Y,X) into a "grid" (G)
  */

diff --git a/src/floor/pattern-walk.c b/src/floor/pattern-walk.c
index 978b557..c3ea406 100644 (file)
--- a/src/floor/pattern-walk.c
+++ b/src/floor/pattern-walk.c
@@ -3,6 +3,7 @@
 #include "core/asking-player.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/floor-save.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/play-record-options.h"

diff --git a/src/market/arena.c b/src/market/arena.c
index 6450841..159014e 100644 (file)
--- a/src/market/arena.c
+++ b/src/market/arena.c
@@ -5,7 +5,7 @@
 #include "core/stuff-handler.h"
 #include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
-#include "floor/floor.h"
+#include "floor/floor-save.h"
 #include "io/input-key-acceptor.h"
 #include "main/sound-of-music.h"
 #include "market/arena-info-table.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 6d1c6da..2b6f05f 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -19,6 +19,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-events.h"
+#include "floor/floor-save.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "grid/feature.h"

diff --git a/src/spell-kind/spells-grid.c b/src/spell-kind/spells-grid.c
index 8944167..2d1498d 100644 (file)
--- a/src/spell-kind/spells-grid.c
+++ b/src/spell-kind/spells-grid.c
@@ -2,6 +2,7 @@
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-object.h"
+#include "floor/floor-save.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "grid/grid.h"

diff --git a/src/spell-kind/spells-world.c b/src/spell-kind/spells-world.c
index 2adcd6b..dc44c1c 100644 (file)
--- a/src/spell-kind/spells-world.c
+++ b/src/spell-kind/spells-world.c
@@ -4,6 +4,7 @@
 #include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/floor-save.h"
 #include "floor/floor-town.h"
 #include "floor/floor.h"
 #include "floor/geometry.h"

diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index ad22034..5344168 100644 (file)
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -4,6 +4,7 @@
 #include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
+#include "floor/floor-save.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"
 #include "game-option/play-record-options.h"

diff --git a/src/world/world-turn-processor.c b/src/world/world-turn-processor.c
index 44a1790..e0e0203 100644 (file)
--- a/src/world/world-turn-processor.c
+++ b/src/world/world-turn-processor.c
@@ -7,6 +7,7 @@
 #include "core/magic-effects-timeout-reducer.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor-events.h"
+#include "floor/floor-save.h"
 #include "floor/wild.h"
 #include "game-option/birth-options.h"
 #include "game-option/cheat-options.h"