From 0c34d00691b952d2d6d2873c7d49b3817581fb3c Mon Sep 17 00:00:00 2001 From: deskull Date: Wed, 8 May 2019 23:20:52 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20max=5Fd=5Fidx=20=E3=82=92?= =?utf8?q?=E3=80=80dungeon.c/h=20=E3=81=B8=E7=A7=BB=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/birth.c | 1 + src/dungeon.c | 4 ++++ src/dungeon.h | 1 + src/externs.h | 1 - src/main-win.c | 1 + src/save.c | 1 + src/variable.c | 5 ----- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/birth.c b/src/birth.c index 1b12c8da6..739b70979 100644 --- 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 8b2e122da..d1df96a95 100644 --- 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 33e9955f8..057763723 100644 --- 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 845c4ff74..480584545 100644 --- 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 f5c21ec1c..bcbadbae3 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -117,6 +117,7 @@ #include #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 cb2875416..8b15d295e 100644 --- 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 159997504..f47636b86 100644 --- 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; -- 2.11.0