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

diff --git a/src/bldg.c b/src/bldg.c
index 47eab3d..06716d8 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -14,6 +14,7 @@
 
 #include "angband.h"
 #include "util.h"
+#include "term.h"
 
 #include "core.h"
 #include "cmd-dump.h"

diff --git a/src/cmd-item.c b/src/cmd-item.c
index cf95606..74c08ea 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -14,6 +14,7 @@
 #include "angband.h"
 #include "util.h"
 #include "autopick.h"
+#include "term.h"
 
 #include "selfinfo.h"
 #include "cmd-activate.h"

diff --git a/src/externs.h b/src/externs.h
index 4a4eae1..a87be9a 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -49,8 +49,6 @@ extern const byte adj_con_fix[];
 extern const byte adj_con_mhp[];
 extern const byte adj_chr_chm[];
 
-
-extern const concptr ident_info[];
 extern const byte feature_action_flags[FF_FLAG_MAX];
 
 /* variable.c */

diff --git a/src/tables.c b/src/tables.c
index b27510b..77bd295 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -988,211 +988,6 @@ const byte adj_chr_chm[] =
        85      /* 18/220+ */
 };
 
-
-/*!
- * @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".
- */
-const concptr ident_info[] =
-{
-#ifdef JP
-       " :暗闇",
-       "!:薬, オイル",
-       "\":アミュレット, 頸飾り",
-       "#:壁(隠しドア)/植物/気体",
-       "$:財宝(金か宝石)",
-       "%:鉱脈(溶岩か石英)",
-       "&:箱",
-       "':開いたドア",
-       "(:軟らかい防具",
-       "):盾",
-       "*:財宝を含んだ鉱脈または球形の怪物",
-       "+:閉じたドア",
-       ",:食べ物, おばけキノコ",
-       "-:魔法棒, ロッド",
-       ".:床",
-       "/:竿状武器(アックス/パイク/等)",
-       "0:博物館の入口",
-       "1:雑貨屋の入口",
-       "2:防具屋の入口",
-       "3:武器専門店の入口",
-       "4:寺院の入口",
-       "5:錬金術の店の入口",
-       "6:魔法の店の入口",
-       "7:ブラックマーケットの入口",
-       "8:我が家の入口",
-       "9:書店の入口",
-       "::岩石",
-       ";:回避の彫像/爆発のルーン",
-       "<:上り階段",
-       "=:指輪",
-       ">:下り階段",
-       "?:巻物",
-       "@:プレイヤー",
-       "A:天使",
-       "B:鳥",
-       "C:犬",
-       "D:古代ドラゴン/ワイアーム",
-       "E:エレメンタル",
-       "F:トンボ",
-       "G:ゴースト",
-       "H:雑種",
-       "I:昆虫",
-       "J:ヘビ",
-       "K:キラー・ビートル",
-       "L:リッチ",
-       "M:多首の爬虫類",
-       "N:謎の生物",
-       "O:オーガ",
-       "P:巨大人間型生物",
-       "Q:クイルスルグ(脈打つ肉塊)",
-       "R:爬虫類/両生類",
-       "S:蜘蛛/サソリ/ダニ",
-       "T:トロル",
-       "U:上級デーモン",
-       "V:バンパイア",
-       "W:ワイト/レイス/等",
-       "X:ゾーン/ザレン/等",
-       "Y:イエティ",
-       "Z:ハウンド",
-       "[:堅いアーマー",
-       "\\:鈍器(メイス/ムチ/等)",
-       "]:種々の防具",
-       "^:トラップ",
-       "_:杖",
-       "`:人形，彫像",
-       "a:アリ",
-       "b:コウモリ",
-       "c:ムカデ",
-       "d:ドラゴン",
-       "e:目玉",
-       "f:ネコ",
-       "g:ゴーレム",
-       "h:ホビット/エルフ/ドワーフ",
-       "i:ベトベト",
-       "j:ゼリー",
-       "k:コボルド",
-       "l:水棲生物",
-       "m:モルド",
-       "n:ナーガ",
-       "o:オーク",
-       "p:人間",
-       "q:四足獣",
-       "r:ネズミ",
-       "s:スケルトン",
-       "t:町の人",
-       "u:下級デーモン",
-       "v:ボルテックス",
-       "w:イモムシ/大群",
-       /* "x:unused", */
-       "y:イーク",
-       "z:ゾンビ/ミイラ",
-       "{:飛び道具の弾(矢/弾)",
-       "|:刀剣類(ソード/ダガー/等)",
-       "}:飛び道具(弓/クロスボウ/スリング)",
-       "~:水/溶岩流(種々のアイテム)",
-#else
-       " :A dark grid",
-       "!:A potion (or oil)",
-       "\":An amulet (or necklace)",
-       "#:A wall (or secret door) / a plant / a gas",
-       "$:Treasure (gold or gems)",
-       "%:A vein (magma or quartz)",
-       "&:A chest",
-       "':An open door",
-       "(:Soft armor",
-       "):A shield",
-       "*:A vein with treasure or a ball monster",
-       "+:A closed door",
-       ",:Food (or mushroom patch)",
-       "-:A wand (or rod)",
-       ".:Floor",
-       "/:A polearm (Axe/Pike/etc)",
-       "0:Entrance to Museum",
-       "1:Entrance to General Store",
-       "2:Entrance to Armory",
-       "3:Entrance to Weaponsmith",
-       "4:Entrance to Temple",
-       "5:Entrance to Alchemy shop",
-       "6:Entrance to Magic store",
-       "7:Entrance to Black Market",
-       "8:Entrance to your home",
-       "9:Entrance to the bookstore",
-       "::Rubble",
-       ";:A glyph of warding / an explosive rune",
-       "<:An up staircase",
-       "=:A ring",
-       ">:A down staircase",
-       "?:A scroll",
-       "@:You",
-       "A:Angel",
-       "B:Bird",
-       "C:Canine",
-       "D:Ancient Dragon/Wyrm",
-       "E:Elemental",
-       "F:Dragon Fly",
-       "G:Ghost",
-       "H:Hybrid",
-       "I:Insect",
-       "J:Snake",
-       "K:Killer Beetle",
-       "L:Lich",
-       "M:Multi-Headed Reptile",
-       "N:Mystery Living",
-       "O:Ogre",
-       "P:Giant Humanoid",
-       "Q:Quylthulg (Pulsing Flesh Mound)",
-       "R:Reptile/Amphibian",
-       "S:Spider/Scorpion/Tick",
-       "T:Troll",
-       "U:Major Demon",
-       "V:Vampire",
-       "W:Wight/Wraith/etc",
-       "X:Xorn/Xaren/etc",
-       "Y:Yeti",
-       "Z:Zephyr Hound",
-       "[:Hard armor",
-       "\\:A hafted weapon (mace/whip/etc)",
-       "]:Misc. armor",
-       "^:A trap",
-       "_:A staff",
-       "`:A figurine or statue",
-       "a:Ant",
-       "b:Bat",
-       "c:Centipede",
-       "d:Dragon",
-       "e:Floating Eye",
-       "f:Feline",
-       "g:Golem",
-       "h:Hobbit/Elf/Dwarf",
-       "i:Icky Thing",
-       "j:Jelly",
-       "k:Kobold",
-       "l:Aquatic monster",
-       "m:Mold",
-       "n:Naga",
-       "o:Orc",
-       "p:Person/Human",
-       "q:Quadruped",
-       "r:Rodent",
-       "s:Skeleton",
-       "t:Townsperson",
-       "u:Minor Demon",
-       "v:Vortex",
-       "w:Worm/Worm-Mass",
-       /* "x:unused", */
-       "y:Yeek",
-       "z:Zombie/Mummy",
-       "{:A missile (arrow/bolt/shot)",
-       "|:An edged weapon (sword/dagger/etc)",
-       "}:A launcher (bow/crossbow/sling)",
-       "~:Fluid terrain (or miscellaneous item)",
-#endif
-
-       NULL
-};
-
-
 /*!
  * @brief 地形状態フラグテーブル /
  * The table of features' actions

diff --git a/src/term.c b/src/term.c
index 25af870..a87c955 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -104,6 +104,210 @@ const concptr window_flag_desc[32] =
        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".
+ */
+const concptr ident_info[] =
+{
+#ifdef JP
+       " :暗闇",
+       "!:薬, オイル",
+       "\":アミュレット, 頸飾り",
+       "#:壁(隠しドア)/植物/気体",
+       "$:財宝(金か宝石)",
+       "%:鉱脈(溶岩か石英)",
+       "&:箱",
+       "':開いたドア",
+       "(:軟らかい防具",
+       "):盾",
+       "*:財宝を含んだ鉱脈または球形の怪物",
+       "+:閉じたドア",
+       ",:食べ物, おばけキノコ",
+       "-:魔法棒, ロッド",
+       ".:床",
+       "/:竿状武器(アックス/パイク/等)",
+       "0:博物館の入口",
+       "1:雑貨屋の入口",
+       "2:防具屋の入口",
+       "3:武器専門店の入口",
+       "4:寺院の入口",
+       "5:錬金術の店の入口",
+       "6:魔法の店の入口",
+       "7:ブラックマーケットの入口",
+       "8:我が家の入口",
+       "9:書店の入口",
+       "::岩石",
+       ";:回避の彫像/爆発のルーン",
+       "<:上り階段",
+       "=:指輪",
+       ">:下り階段",
+       "?:巻物",
+       "@:プレイヤー",
+       "A:天使",
+       "B:鳥",
+       "C:犬",
+       "D:古代ドラゴン/ワイアーム",
+       "E:エレメンタル",
+       "F:トンボ",
+       "G:ゴースト",
+       "H:雑種",
+       "I:昆虫",
+       "J:ヘビ",
+       "K:キラー・ビートル",
+       "L:リッチ",
+       "M:多首の爬虫類",
+       "N:謎の生物",
+       "O:オーガ",
+       "P:巨大人間型生物",
+       "Q:クイルスルグ(脈打つ肉塊)",
+       "R:爬虫類/両生類",
+       "S:蜘蛛/サソリ/ダニ",
+       "T:トロル",
+       "U:上級デーモン",
+       "V:バンパイア",
+       "W:ワイト/レイス/等",
+       "X:ゾーン/ザレン/等",
+       "Y:イエティ",
+       "Z:ハウンド",
+       "[:堅いアーマー",
+       "\\:鈍器(メイス/ムチ/等)",
+       "]:種々の防具",
+       "^:トラップ",
+       "_:杖",
+       "`:人形，彫像",
+       "a:アリ",
+       "b:コウモリ",
+       "c:ムカデ",
+       "d:ドラゴン",
+       "e:目玉",
+       "f:ネコ",
+       "g:ゴーレム",
+       "h:ホビット/エルフ/ドワーフ",
+       "i:ベトベト",
+       "j:ゼリー",
+       "k:コボルド",
+       "l:水棲生物",
+       "m:モルド",
+       "n:ナーガ",
+       "o:オーク",
+       "p:人間",
+       "q:四足獣",
+       "r:ネズミ",
+       "s:スケルトン",
+       "t:町の人",
+       "u:下級デーモン",
+       "v:ボルテックス",
+       "w:イモムシ/大群",
+       /* "x:unused", */
+       "y:イーク",
+       "z:ゾンビ/ミイラ",
+       "{:飛び道具の弾(矢/弾)",
+       "|:刀剣類(ソード/ダガー/等)",
+       "}:飛び道具(弓/クロスボウ/スリング)",
+       "~:水/溶岩流(種々のアイテム)",
+#else
+       " :A dark grid",
+       "!:A potion (or oil)",
+       "\":An amulet (or necklace)",
+       "#:A wall (or secret door) / a plant / a gas",
+       "$:Treasure (gold or gems)",
+       "%:A vein (magma or quartz)",
+       "&:A chest",
+       "':An open door",
+       "(:Soft armor",
+       "):A shield",
+       "*:A vein with treasure or a ball monster",
+       "+:A closed door",
+       ",:Food (or mushroom patch)",
+       "-:A wand (or rod)",
+       ".:Floor",
+       "/:A polearm (Axe/Pike/etc)",
+       "0:Entrance to Museum",
+       "1:Entrance to General Store",
+       "2:Entrance to Armory",
+       "3:Entrance to Weaponsmith",
+       "4:Entrance to Temple",
+       "5:Entrance to Alchemy shop",
+       "6:Entrance to Magic store",
+       "7:Entrance to Black Market",
+       "8:Entrance to your home",
+       "9:Entrance to the bookstore",
+       "::Rubble",
+       ";:A glyph of warding / an explosive rune",
+       "<:An up staircase",
+       "=:A ring",
+       ">:A down staircase",
+       "?:A scroll",
+       "@:You",
+       "A:Angel",
+       "B:Bird",
+       "C:Canine",
+       "D:Ancient Dragon/Wyrm",
+       "E:Elemental",
+       "F:Dragon Fly",
+       "G:Ghost",
+       "H:Hybrid",
+       "I:Insect",
+       "J:Snake",
+       "K:Killer Beetle",
+       "L:Lich",
+       "M:Multi-Headed Reptile",
+       "N:Mystery Living",
+       "O:Ogre",
+       "P:Giant Humanoid",
+       "Q:Quylthulg (Pulsing Flesh Mound)",
+       "R:Reptile/Amphibian",
+       "S:Spider/Scorpion/Tick",
+       "T:Troll",
+       "U:Major Demon",
+       "V:Vampire",
+       "W:Wight/Wraith/etc",
+       "X:Xorn/Xaren/etc",
+       "Y:Yeti",
+       "Z:Zephyr Hound",
+       "[:Hard armor",
+       "\\:A hafted weapon (mace/whip/etc)",
+       "]:Misc. armor",
+       "^:A trap",
+       "_:A staff",
+       "`:A figurine or statue",
+       "a:Ant",
+       "b:Bat",
+       "c:Centipede",
+       "d:Dragon",
+       "e:Floating Eye",
+       "f:Feline",
+       "g:Golem",
+       "h:Hobbit/Elf/Dwarf",
+       "i:Icky Thing",
+       "j:Jelly",
+       "k:Kobold",
+       "l:Aquatic monster",
+       "m:Mold",
+       "n:Naga",
+       "o:Orc",
+       "p:Person/Human",
+       "q:Quadruped",
+       "r:Rodent",
+       "s:Skeleton",
+       "t:Townsperson",
+       "u:Minor Demon",
+       "v:Vortex",
+       "w:Worm/Worm-Mass",
+       /* "x:unused", */
+       "y:Yeek",
+       "z:Zombie/Mummy",
+       "{:A missile (arrow/bolt/shot)",
+       "|:An edged weapon (sword/dagger/etc)",
+       "}:A launcher (bow/crossbow/sling)",
+       "~:Fluid terrain (or miscellaneous item)",
+#endif
+
+       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 6954ad1..9969fcc 100644 (file)
--- a/src/term.h
+++ b/src/term.h
@@ -3,6 +3,9 @@
 #include "spells.h"
 
 extern const concptr color_names[16];
+extern const concptr window_flag_desc[32];
+extern const concptr ident_info[];
+
 
 extern TERM_COLOR misc_to_attr[256];
 extern SYMBOL_CODE misc_to_char[256];
@@ -15,5 +18,3 @@ 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