[Refactor] #37353 angband_term を term.c/h に移動．

diff --git a/src/chuukei.c b/src/chuukei.c
index bf0a585..ff61837 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -10,9 +10,11 @@
 
 #include "files.h"
 #include "util.h"
+#include "term.h"
 #include "cmd-dump.h"
 #include "inet.h"
 #include "japanese.h"
+#include "term.h"
 
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/core.c b/src/core.c
index a95f2be..2fa002c 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -14,6 +14,7 @@
 #include "util.h"
 #include "core.h"
 #include "inet.h"
+#include "term.h"
 
 #include "creature.h"
 

diff --git a/src/externs.h b/src/externs.h
index c25a39f..4a669dc 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -58,8 +58,6 @@ extern pos_list tmp_pos;
 extern STR_OFFSET quark__num;
 extern concptr *quark__str;
 
-extern term *angband_term[8];
-
 extern player_type *p_ptr;
 
 extern MONSTER_IDX pet_t_m_idx;

diff --git a/src/term.c b/src/term.c
index 8aee418..7319f37 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -346,6 +346,11 @@ const concptr ident_info[] =
        NULL
 };
 
+/*
+ * The array of window pointers
+ */
+term *angband_term[8];
+
 /*!
  * スクリーン表示色キャラクタ /
  * Encode the screen colors

diff --git a/src/term.h b/src/term.h
index ef91f4b..04a50eb 100644 (file)
--- a/src/term.h
+++ b/src/term.h
@@ -49,6 +49,8 @@ extern const concptr window_flag_desc[32];
 extern const concptr ident_info[];
 extern const concptr color_char;
 
+extern term *angband_term[8];
+
 extern TERM_COLOR misc_to_attr[256];
 extern SYMBOL_CODE misc_to_char[256];
 extern TERM_COLOR tval_to_attr[128];

diff --git a/src/variable.c b/src/variable.c
index 6a01a00..c271bf3 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -30,11 +30,6 @@ STR_OFFSET quark__num;
  */
 concptr *quark__str;
 
-/*
- * The array of window pointers
- */
-term *angband_term[8];
-
 
 
 /*** Player information ***/

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 7a9de84..adeef10 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -57,12 +57,10 @@ static object_type *autopick_obj; /*!< 各種自動拾い処理時に使うオ
 /*
  * Dungeon size info
  */
-
 POSITION panel_row_min, panel_row_max;
 POSITION panel_col_min, panel_col_max;
 POSITION panel_col_prt, panel_row_prt;
 
-
  /*
   * Some screen locations for various display routines
   * Currently, row 8 and 15 are the only "blank" rows.