• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision8288b552110a0974a543266caaa84469f1c635d6 (tree)
Time2019-05-10 21:00:35
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -49,7 +49,6 @@ extern const byte adj_con_fix[];
4949 extern const byte adj_con_mhp[];
5050 extern const byte adj_chr_chm[];
5151
52-extern const concptr window_flag_desc[32];
5352
5453 extern const concptr ident_info[];
5554 extern const byte feature_action_flags[FF_FLAG_MAX];
--- a/src/init.c
+++ b/src/init.c
@@ -36,6 +36,7 @@
3636 #include "util.h"
3737 #include "files.h"
3838 #include "core.h"
39+#include "term.h"
3940
4041 #include "artifact.h"
4142 #include "bldg.h"
--- a/src/tables.c
+++ b/src/tables.c
@@ -990,62 +990,6 @@ const byte adj_chr_chm[] =
990990
991991
992992 /*!
993- * @brief サブウィンドウ名称テーブル
994- * @details
995- * <pre>
996- * Certain "screens" always use the main screen, including News, Birth,
997- * Dungeon, Tomb-stone, High-scores, Macros, Colors, Visuals, Options.
998- *
999- * Later, special flags may allow sub-windows to "steal" stuff from the
1000- * main window, including File dump (help), File dump (artifacts, uniques),
1001- * Character screen, Small scale map, Previous Messages, Store screen, etc.
1002- *
1003- * The "ctrl-i" (tab) command flips the "Display inven/equip" and "Display
1004- * equip/inven" flags for all windows.
1005- *
1006- * The "ctrl-g" command (or pseudo-command) should perhaps grab a snapshot
1007- * of the main screen into any interested windows.
1008- * </pre>
1009- */
1010-const concptr window_flag_desc[32] =
1011-{
1012- _("持ち物/装備一覧", "Display inven/equip"),
1013- _("装備/持ち物一覧", "Display equip/inven"),
1014- _("呪文一覧", "Display spell list"),
1015- _("キャラクタ情報", "Display character"),
1016- _("視界内のモンスター表示", "Display monsters in sight"),
1017- NULL,
1018- _("メッセージ", "Display messages"),
1019- _("ダンジョン全体図", "Display overhead view"),
1020- _("モンスターの思い出", "Display monster recall"),
1021- _("アイテムの詳細", "Display object recall"),
1022- _("自分の周囲を表示", "Display dungeon view"),
1023- _("記念撮影", "Display snap-shot"),
1024- NULL,
1025- NULL,
1026- _("ボーグ・メッセージ", "Display borg messages"),
1027- _("ボーグ・ステータス", "Display borg status"),
1028- NULL,
1029- NULL,
1030- NULL,
1031- NULL,
1032- NULL,
1033- NULL,
1034- NULL,
1035- NULL,
1036- NULL,
1037- NULL,
1038- NULL,
1039- NULL,
1040- NULL,
1041- NULL,
1042- NULL,
1043- NULL
1044-};
1045-
1046-
1047-
1048-/*!
1049993 * @brief シンボル解説テーブル /
1050994 * 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".
1051995 */
--- a/src/term.c
+++ b/src/term.c
@@ -49,6 +49,61 @@ const concptr color_names[16] =
4949
5050 };
5151
52+
53+/*!
54+ * @brief サブウィンドウ名称テーブル
55+ * @details
56+ * <pre>
57+ * Certain "screens" always use the main screen, including News, Birth,
58+ * Dungeon, Tomb-stone, High-scores, Macros, Colors, Visuals, Options.
59+ *
60+ * Later, special flags may allow sub-windows to "steal" stuff from the
61+ * main window, including File dump (help), File dump (artifacts, uniques),
62+ * Character screen, Small scale map, Previous Messages, Store screen, etc.
63+ *
64+ * The "ctrl-i" (tab) command flips the "Display inven/equip" and "Display
65+ * equip/inven" flags for all windows.
66+ *
67+ * The "ctrl-g" command (or pseudo-command) should perhaps grab a snapshot
68+ * of the main screen into any interested windows.
69+ * </pre>
70+ */
71+const concptr window_flag_desc[32] =
72+{
73+ _("持ち物/装備一覧", "Display inven/equip"),
74+ _("装備/持ち物一覧", "Display equip/inven"),
75+ _("呪文一覧", "Display spell list"),
76+ _("キャラクタ情報", "Display character"),
77+ _("視界内のモンスター表示", "Display monsters in sight"),
78+ NULL,
79+ _("メッセージ", "Display messages"),
80+ _("ダンジョン全体図", "Display overhead view"),
81+ _("モンスターの思い出", "Display monster recall"),
82+ _("アイテムの詳細", "Display object recall"),
83+ _("自分の周囲を表示", "Display dungeon view"),
84+ _("記念撮影", "Display snap-shot"),
85+ NULL,
86+ NULL,
87+ _("ボーグ・メッセージ", "Display borg messages"),
88+ _("ボーグ・ステータス", "Display borg status"),
89+ NULL,
90+ NULL,
91+ NULL,
92+ NULL,
93+ NULL,
94+ NULL,
95+ NULL,
96+ NULL,
97+ NULL,
98+ NULL,
99+ NULL,
100+ NULL,
101+ NULL,
102+ NULL,
103+ NULL,
104+ NULL
105+};
106+
52107 /*
53108 * Specify attr/char pairs for visual special effects
54109 * Be sure to use "index & 0x7F" to avoid illegal access
--- 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);
1515
1616 extern TERM_COLOR gf_color[MAX_GF];
1717 extern TERM_COLOR color_char_to_attr(SYMBOL_CODE c);
18+
19+extern const concptr window_flag_desc[32];
\ No newline at end of file
Show on old repository browser