[Refactor] #37353 window_flag_desc を term.c/h へ移動．

diff --git a/src/externs.h b/src/externs.h
index d8bcc08..4a4eae1 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -49,7 +49,6 @@ extern const byte adj_con_fix[];
 extern const byte adj_con_mhp[];
 extern const byte adj_chr_chm[];
 
-extern const concptr window_flag_desc[32];
 
 extern const concptr ident_info[];
 extern const byte feature_action_flags[FF_FLAG_MAX];

diff --git a/src/init.c b/src/init.c
index 4cd0d12..2a0ce90 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -36,6 +36,7 @@
 #include "util.h"
 #include "files.h"
 #include "core.h"
+#include "term.h"
 
 #include "artifact.h"
 #include "bldg.h"

diff --git a/src/tables.c b/src/tables.c
index f76a736..b27510b 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -990,62 +990,6 @@ const byte adj_chr_chm[] =
 
 
 /*!
- * @brief サブウィンドウ名称テーブル
- * @details
- * <pre>
- * Certain "screens" always use the main screen, including News, Birth,
- * Dungeon, Tomb-stone, High-scores, Macros, Colors, Visuals, Options.
- *
- * Later, special flags may allow sub-windows to "steal" stuff from the
- * main window, including File dump (help), File dump (artifacts, uniques),
- * Character screen, Small scale map, Previous Messages, Store screen, etc.
- *
- * The "ctrl-i" (tab) command flips the "Display inven/equip" and "Display
- * equip/inven" flags for all windows.
- *
- * The "ctrl-g" command (or pseudo-command) should perhaps grab a snapshot
- * of the main screen into any interested windows.
- * </pre>
- */
-const concptr window_flag_desc[32] =
-{
-       _("持ち物/装備一覧", "Display inven/equip"),
-       _("装備/持ち物一覧", "Display equip/inven"),
-       _("呪文一覧", "Display spell list"),
-       _("キャラクタ情報", "Display character"),
-       _("視界内のモンスター表示", "Display monsters in sight"),
-       NULL,
-       _("メッセージ", "Display messages"),
-       _("ダンジョン全体図", "Display overhead view"),
-       _("モンスターの思い出", "Display monster recall"),
-       _("アイテムの詳細", "Display object recall"),
-       _("自分の周囲を表示", "Display dungeon view"),
-       _("記念撮影", "Display snap-shot"),
-       NULL,
-       NULL,
-       _("ボーグ・メッセージ", "Display borg messages"),
-       _("ボーグ・ステータス", "Display borg status"),
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       NULL
-};
-
-
-
-/*!
  * @brief シンボル解説テーブル /
  * The table of "symbol info" -- each entry is a string of the form "X:desc" where "X" is the trigger, and "desc" is the "info".
  */

diff --git a/src/term.c b/src/term.c
index 9749c50..25af870 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -49,6 +49,61 @@ const concptr color_names[16] =
 
 };
 
+
+/*!
+ * @brief サブウィンドウ名称テーブル
+ * @details
+ * <pre>
+ * Certain "screens" always use the main screen, including News, Birth,
+ * Dungeon, Tomb-stone, High-scores, Macros, Colors, Visuals, Options.
+ *
+ * Later, special flags may allow sub-windows to "steal" stuff from the
+ * main window, including File dump (help), File dump (artifacts, uniques),
+ * Character screen, Small scale map, Previous Messages, Store screen, etc.
+ *
+ * The "ctrl-i" (tab) command flips the "Display inven/equip" and "Display
+ * equip/inven" flags for all windows.
+ *
+ * The "ctrl-g" command (or pseudo-command) should perhaps grab a snapshot
+ * of the main screen into any interested windows.
+ * </pre>
+ */
+const concptr window_flag_desc[32] =
+{
+       _("持ち物/装備一覧", "Display inven/equip"),
+       _("装備/持ち物一覧", "Display equip/inven"),
+       _("呪文一覧", "Display spell list"),
+       _("キャラクタ情報", "Display character"),
+       _("視界内のモンスター表示", "Display monsters in sight"),
+       NULL,
+       _("メッセージ", "Display messages"),
+       _("ダンジョン全体図", "Display overhead view"),
+       _("モンスターの思い出", "Display monster recall"),
+       _("アイテムの詳細", "Display object recall"),
+       _("自分の周囲を表示", "Display dungeon view"),
+       _("記念撮影", "Display snap-shot"),
+       NULL,
+       NULL,
+       _("ボーグ・メッセージ", "Display borg messages"),
+       _("ボーグ・ステータス", "Display borg status"),
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL
+};
+
 /*
  * Specify attr/char pairs for visual special effects
  * Be sure to use "index & 0x7F" to avoid illegal access

diff --git a/src/term.h b/src/term.h
index f2b41c5..6954ad1 100644 (file)
--- a/src/term.h
+++ b/src/term.h
@@ -15,3 +15,5 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ);
 
 extern TERM_COLOR gf_color[MAX_GF];
 extern TERM_COLOR color_char_to_attr(SYMBOL_CODE c);
+
+extern const concptr window_flag_desc[32];
\ No newline at end of file