[Refactor] #37353 max_d_idx を dungeon.c/h へ移動．

diff --git a/src/birth.c b/src/birth.c
index 1b12c8d..739b709 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -18,6 +18,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "cmd-dump.h"
+#include "dungeon.h"
 #include "history.h"
 #include "monsterrace-hook.h"
 #include "store.h"

diff --git a/src/dungeon.c b/src/dungeon.c
index 8b2e122..d1df96a 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -8,3 +8,7 @@ dungeon_type *d_info;
 char *d_name;
 char *d_text;
 
+/*
+ * Maximum number of dungeon in d_info.txt
+ */
+DUNGEON_IDX max_d_idx;

diff --git a/src/dungeon.h b/src/dungeon.h
index 33e9955..0577637 100644 (file)
--- a/src/dungeon.h
+++ b/src/dungeon.h
@@ -55,6 +55,7 @@ struct dungeon_type {
        int obj_good;
 };
 
+extern DUNGEON_IDX max_d_idx;
 extern dungeon_type *d_info;
 extern char *d_name;
 extern char *d_text;
\ No newline at end of file

diff --git a/src/externs.h b/src/externs.h
index 845c4ff..4805845 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -161,7 +161,6 @@ extern VAULT_IDX max_v_idx;
 extern FEAT_IDX max_f_idx;
 
 extern EGO_IDX max_e_idx;
-extern DUNGEON_IDX max_d_idx;
 extern int init_flags;
 extern int highscore_fd;
 extern bool can_save;

diff --git a/src/main-win.c b/src/main-win.c
index f5c21ec..bcbadba 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -117,6 +117,7 @@
 #include <locale.h>
 #include "z-term.h"
 #include "save.h"
+#include "dungeon.h"
 
 /*
  * Extract the "WIN32" flag from the compiler

diff --git a/src/save.c b/src/save.c
index cb28754..8b15d29 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -18,6 +18,7 @@
 
 #include "artifact.h"
 #include "sort.h"
+#include "dungeon.h"
 #include "quest.h"
 #include "store.h"
 #include "wild.h"

diff --git a/src/variable.c b/src/variable.c
index 1599975..f47636b 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -377,11 +377,6 @@ FEAT_IDX max_f_idx;
 EGO_IDX max_e_idx;
 
 /*
- * Maximum number of dungeon in e_info.txt
- */
-DUNGEON_IDX max_d_idx;
-
-/*
  * Flags for initialization
  */
 int init_flags;