[Refactor] #37353 saved_floor_type を floor-save.h に移動．

diff --git a/src/externs.h b/src/externs.h
index 657b0fa..ceb4154 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -13,6 +13,7 @@
  * (z-virt.h, z-util.h, z-form.h, term.h, random.h)
  */
 #include "geometry.h"
+#include "floor-save.h"
 
 /*
  * Automatically generated "variable" declarations

diff --git a/src/floor-save.h b/src/floor-save.h
index 6e2bf06..99a7b05 100644 (file)
--- a/src/floor-save.h
+++ b/src/floor-save.h
@@ -1,5 +1,19 @@
 #pragma once
 
+/*
+ *  A structure type for the saved floor
+ */
+typedef struct
+{
+       FLOOR_IDX floor_id;        /* No recycle until 65536 IDs are all used */
+       s16b savefile_id;     /* ID for savefile (from 0 to MAX_SAVED_FLOOR) */
+       DEPTH dun_level;
+       s32b last_visit;      /* Time count of last visit. 0 for new floor. */
+       u32b visit_mark;      /* Older has always smaller mark. */
+       FLOOR_IDX upper_floor_id;  /* a floor connected with level teleportation */
+       FLOOR_IDX lower_floor_id;  /* a floor connected with level tel. and trap door */
+} saved_floor_type;
+
 extern void init_saved_floors(bool force);
 extern void change_floor(void);
 extern void leave_floor(void);

diff --git a/src/floor.c b/src/floor.c
index 4256ae4..a9d6b02 100644 (file)
--- a/src/floor.c
+++ b/src/floor.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "floor.h"
+#include "floor-save.h"
 
 /*
  * The array of "current_floor_ptr->grid_array grids" [MAX_WID][MAX_HGT].

diff --git a/src/types.h b/src/types.h
index 66f69be..58a2fff 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1682,21 +1682,6 @@ typedef struct {
 
 
 /*
- *  A structure type for the saved floor
- */
-typedef struct 
-{
-       FLOOR_IDX floor_id;        /* No recycle until 65536 IDs are all used */
-       s16b savefile_id;     /* ID for savefile (from 0 to MAX_SAVED_FLOOR) */
-       DEPTH dun_level;
-       s32b last_visit;      /* Time count of last visit. 0 for new floor. */
-       u32b visit_mark;      /* Older has always smaller mark. */
-       FLOOR_IDX upper_floor_id;  /* a floor connected with level teleportation */
-       FLOOR_IDX lower_floor_id;  /* a floor connected with level tel. and trap door */
-} saved_floor_type;
-
-
-/*
  *  A structure type for terrain template of saving dungeon floor
  */
 typedef struct