[Refactor] #37353 vault_type と関連配列を rooms-vault.c/h へ移動。

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 4e42466..650ccc4 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -13,6 +13,7 @@
 #include "floor.h"
 #include "bldg.h"
 #include "world.h"
+#include "rooms-vault.h"
 
 dungeon_grid letter[255];
 

diff --git a/src/externs.h b/src/externs.h
index f6d60ae..2d1666f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -243,9 +243,6 @@ extern const player_class *cp_ptr;
 extern const player_seikaku *ap_ptr;
 extern const player_magic *mp_ptr;
 extern birther previous_char;
-extern vault_type *v_info;
-extern char *v_name;
-extern char *v_text;
 extern skill_table *s_info;
 extern player_magic *m_info;
 extern char *f_name;

diff --git a/src/init.c b/src/init.c
index c8e428a..3c03b21 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -48,6 +48,7 @@
 #include "feature.h"
 #include "floor.h"
 #include "dungeon.h"
+#include "rooms-vault.h"
 
 #ifndef MACINTOSH
 #ifdef CHECK_MODIFICATION_TIME

diff --git a/src/rooms-vault.c b/src/rooms-vault.c
index c8bb401..254ddfa 100644 (file)
--- a/src/rooms-vault.c
+++ b/src/rooms-vault.c
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "util.h"
+#include "rooms-vault.h"
 
 #include "floor-generate.h"
 #include "grid.h"
@@ -12,6 +13,13 @@
 #include "dungeon.h"
 
 /*
+ * The vault generation arrays
+ */
+vault_type *v_info;
+char *v_name;
+char *v_text;
+
+/*
 * This function creates a random vault that looks like a collection of bubbles.
 * It works by getting a set of coordinates that represent the center of each
 * bubble.  The entire room is made by seeing which bubble center is closest. If

diff --git a/src/rooms-vault.h b/src/rooms-vault.h
index 7fccebe..a7a3afa 100644 (file)
--- a/src/rooms-vault.h
+++ b/src/rooms-vault.h
@@ -1,4 +1,25 @@
-extern bool build_type7(void);
+/*
+ * Information about "vault generation"
+ */
+
+typedef struct vault_type vault_type;
+
+struct vault_type
+{
+       STR_OFFSET name;        /* Name (offset) */
+       STR_OFFSET text;        /* Text (offset) */
+
+       ROOM_IDX typ;           /* Vault type */
+       PROB rat;                       /* Vault rating (unused) */
+       POSITION hgt;           /* Vault height */
+       POSITION wid;           /* Vault width */
+};
+
+extern vault_type *v_info;
+extern char *v_name;
+extern char *v_text;
+
+extern bool build_type7(void);
 extern bool build_type8(void);
 extern bool build_type10(void);
 extern bool build_type17(void);

diff --git a/src/types.h b/src/types.h
index c6bdeba..ac917fb 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -593,25 +593,6 @@ struct monster_race
 };
 
 
-
-/*
- * Information about "vault generation"
- */
-
-typedef struct vault_type vault_type;
-
-struct vault_type
-{
-       STR_OFFSET name;        /* Name (offset) */
-       STR_OFFSET text;        /* Text (offset) */
-
-       ROOM_IDX typ;           /* Vault type */
-       PROB rat;                       /* Vault rating (unused) */
-       POSITION hgt;           /* Vault height */
-       POSITION wid;           /* Vault width */
-};
-
-
 /*
  * Information about "skill"
  */

diff --git a/src/variable.c b/src/variable.c
index 6c76f0c..e3f6017 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -532,14 +532,6 @@ const player_magic *mp_ptr;
  */
 birther previous_char;
 
-
-/*
- * The vault generation arrays
- */
-vault_type *v_info;
-char *v_name;
-char *v_text;
-
 /*
  * The skill table
  */