[Refactor] #37353 misc_to_attr, misc_to_char, tval_to_attr, tval_to_char を term.c...

diff --git a/src/externs.h b/src/externs.h
index edf6eff..2494136 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -202,10 +202,6 @@ extern const concptr angband_sound_name[SOUND_MAX];
 extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX];
 extern FLOOR_IDX max_floor_id;
 extern u32b saved_floor_file_sign;
-extern TERM_COLOR misc_to_attr[256];
-extern SYMBOL_CODE misc_to_char[256];
-extern TERM_COLOR tval_to_attr[128];
-extern SYMBOL_CODE tval_to_char[128];
 extern concptr keymap_act[KEYMAP_MODES][256];
 extern player_type *p_ptr;
 extern char *f_name;

diff --git a/src/object1.c b/src/object1.c
index 6201899..9df2bb1 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -24,6 +24,7 @@
 #include "player-move.h"
 #include "monster.h"
 #include "files.h"
+#include "term.h"
 
 #if defined(MACINTOSH) || defined(MACH_O_CARBON)
 #ifdef verify

diff --git a/src/store.c b/src/store.c
index 887b0fb..a88b12b 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "term.h"
 
 #include "floor.h"
 #include "cmd-dump.h"

diff --git a/src/term.c b/src/term.c
index ddb8945..63b4790 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -6,6 +6,20 @@
 #include "core.h"
 
 /*
+ * Specify attr/char pairs for visual special effects
+ * Be sure to use "index & 0x7F" to avoid illegal access
+ */
+TERM_COLOR misc_to_attr[256];
+SYMBOL_CODE misc_to_char[256];
+
+/*
+ * Specify attr/char pairs for p_ptr->inventory_list items (by tval)
+ * Be sure to use "index & 0x7F" to avoid illegal access
+ */
+TERM_COLOR tval_to_attr[128];
+SYMBOL_CODE tval_to_char[128];
+
+/*
  * Default spell color table (quark index)
  */
 TERM_COLOR gf_color[MAX_GF];

diff --git a/src/term.h b/src/term.h
index d7eae1c..02f96ff 100644 (file)
--- a/src/term.h
+++ b/src/term.h
@@ -2,6 +2,11 @@
 
 #include "spells.h"
 
+extern TERM_COLOR misc_to_attr[256];
+extern SYMBOL_CODE misc_to_char[256];
+extern TERM_COLOR tval_to_attr[128];
+extern SYMBOL_CODE tval_to_char[128];
+
 TERM_COLOR mh_attr(int max);
 TERM_COLOR spell_color(EFFECT_ID type);
 u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ);

diff --git a/src/variable.c b/src/variable.c
index b5a9992..63ab5cd 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -412,21 +412,6 @@ FLOOR_IDX max_floor_id;
  */
 u32b saved_floor_file_sign;
 
-/*
- * Specify attr/char pairs for visual special effects
- * Be sure to use "index & 0x7F" to avoid illegal access
- */
-TERM_COLOR misc_to_attr[256];
-SYMBOL_CODE misc_to_char[256];
-
-
-/*
- * Specify attr/char pairs for p_ptr->inventory_list items (by tval)
- * Be sure to use "index & 0x7F" to avoid illegal access
- */
-TERM_COLOR tval_to_attr[128];
-SYMBOL_CODE tval_to_char[128];
-
 
 /*
  * Keymaps for each "mode" associated with each keypress.

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 04693dd..3c13bdf 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 #include "autopick.h"
+#include "term.h"
 
 #include "files.h"
 #include "world.h"