Merge remote-tracking branch 'remotes/origin/MERFOLK'

[hengband/hengband.git] / src / tables.c

diff --git a/src/tables.c b/src/tables.c
index e79074b..62b9ec0 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -96,7 +96,7 @@ const char listsym[] =
  * スクリーン表示色キャラクタ /
  * Encode the screen colors
  */
-const cptr color_char = "dwsorgbuDWvyRGBU";
+const concptr color_char = "dwsorgbuDWvyRGBU";
 
 
 /*!
@@ -3559,7 +3559,7 @@ const s32b realm_choices2[MAX_CLASS] =
 /*!
  * 領域魔法名称
  */
-const cptr realm_names[] =
+const concptr realm_names[] =
 {
        "魔法なし",
        "生命",
@@ -3585,9 +3585,9 @@ const cptr realm_names[] =
 #endif
 
 #ifdef JP
-const cptr E_realm_names[]
+const concptr E_realm_names[]
 #else
-const cptr realm_names[]
+const concptr realm_names[]
 #endif
 = {
        "none",
@@ -3701,7 +3701,7 @@ const int chest_traps[64] =
  * </pre>
  */
 #ifdef JP
-const cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
+const concptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 {
        /* Warrior */
        {
@@ -4103,7 +4103,7 @@ const cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 };
 
 #else
-const cptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
+const concptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 {
        /* Warrior */
        {
@@ -4707,7 +4707,7 @@ const monster_power monster_powers[MAX_MONSPELLS] =
 /*!
  * @brief モンスター魔法名テーブル
  */
-const cptr monster_powers_short[MAX_MONSPELLS] = {
+const concptr monster_powers_short[MAX_MONSPELLS] = {
 #ifdef JP
 
        "叫ぶ", "何か", "魔力消去", "ロケット", "射撃", "何か", "何か", "何か",
@@ -4749,7 +4749,7 @@ const cptr monster_powers_short[MAX_MONSPELLS] = {
 /*!
  * @brief 色名称テーブル / Hack -- the "basic" color names (see "TERM_xxx")
  */
-const cptr color_names[16] =
+const concptr color_names[16] =
 {
 #ifdef JP
        "黒",
@@ -4793,7 +4793,7 @@ const cptr color_names[16] =
 /*!
  * @brief 能力値テーブル / Abbreviations of healthy stats
  */
-const cptr stat_names[6] =
+const concptr stat_names[6] =
 {
 #ifdef JP
        "腕力 :", "知能 :", "賢さ :", "器用 :", "耐久 :", "魅力 :"
@@ -4806,7 +4806,7 @@ const cptr stat_names[6] =
 /*!
  * @brief 能力値テーブル(能力低下時) / Abbreviations of damaged stats
  */
-const cptr stat_names_reduced[6] =
+const concptr stat_names_reduced[6] =
 {
 #ifdef JP
        "腕力x:", "知能x:", "賢さx:", "器用x:", "耐久x:", "魅力x:"
@@ -4835,89 +4835,24 @@ const cptr stat_names_reduced[6] =
  * of the main screen into any interested windows.
  * </pre>
  */
-const cptr window_flag_desc[32] =
+const concptr window_flag_desc[32] =
 {
-#ifdef JP
-       "持ち物/装備一覧",
-#else
-       "Display inven/equip",
-#endif
-
-#ifdef JP
-       "装備/持ち物一覧",
-#else
-       "Display equip/inven",
-#endif
-
-#ifdef JP
-       "呪文一覧",
-#else
-       "Display spell list",
-#endif
-
-#ifdef JP
-       "キャラクタ情報",
-#else
-       "Display character",
-#endif
-               
-#ifdef JP
-       "視界内のモンスター表示",
-#else
-       "Display monsters in sight",
-#endif         
-
+       _("持ち物/装備一覧", "Display inven/equip"),
+       _("装備/持ち物一覧", "Display equip/inven"),
+       _("呪文一覧", "Display spell list"),
+       _("キャラクタ情報", "Display character"),
+       _("視界内のモンスター表示", "Display monsters in sight"),
        NULL,
-#ifdef JP
-       "メッセージ",
-#else
-       "Display messages",
-#endif
-
-#ifdef JP
-       "ダンジョン全体図",
-#else
-       "Display overhead view",
-#endif
-
-#ifdef JP
-       "モンスターの思い出",
-#else
-       "Display monster recall",
-#endif
-
-#ifdef JP
-       "アイテムの詳細",
-#else
-       "Display object recall",
-#endif
-
-#ifdef JP
-       "自分の周囲を表示", 
-#else
-       "Display dungeon view",
-#endif
-
-#ifdef JP
-       "記念撮影",
-#else
-       "Display snap-shot",
-#endif
-
+       _("メッセージ", "Display messages"),
+       _("ダンジョン全体図", "Display overhead view"),
+       _("モンスターの思い出", "Display monster recall"),
+       _("アイテムの詳細", "Display object recall"),
+       _("自分の周囲を表示", "Display dungeon view"),
+       _("記念撮影", "Display snap-shot"),
        NULL,
        NULL,
-#ifdef JP
-       "ボーグ・メッセージ",
-#else
-       "Display borg messages",
-#endif
-
-#ifdef JP
-       "ボーグ・ステータス",
-#else
-       "Display borg status",
-#endif
-
+       _("ボーグ・メッセージ", "Display borg messages"),
+       _("ボーグ・ステータス", "Display borg status"),
        NULL,
        NULL,
        NULL,
@@ -4942,7 +4877,7 @@ const cptr window_flag_desc[32] =
 /*!
  * @brief カオスパトロン名テーブル
  */
-const cptr chaos_patrons[MAX_PATRON] =
+const concptr chaos_patrons[MAX_PATRON] =
 {
        "スローター",
        "マベロード",
@@ -4965,7 +4900,7 @@ const cptr chaos_patrons[MAX_PATRON] =
        "カイン"
 };
 #else
-const cptr chaos_patrons[MAX_PATRON] =
+const concptr chaos_patrons[MAX_PATRON] =
 {
        "Slortar",
        "Mabelode",
@@ -5259,7 +5194,7 @@ const int monk_ave_damage[PY_MAX_LEVEL+1][3] =
  * @brief アイテムの価値記述テーブル /
  * Table of game-generated inscriptions (indexed by the defines in defines.h). -- RG
  */
-const cptr game_inscriptions[] =
+const concptr game_inscriptions[] =
 {
        NULL,            /* FEEL_NONE */
 #ifdef JP
@@ -5325,7 +5260,7 @@ const kamae kata_shurui[MAX_KATA] =
 /*!
  * @brief 技能値到達表記テーブル
  */
-const cptr exp_level_str[5]=
+const concptr exp_level_str[5]=
 #ifdef JP
 {"[初心者]", "[入門者]", "[熟練者]", "[エキスパート]", "[達人]"};
 #else
@@ -5336,7 +5271,7 @@ const cptr exp_level_str[5]=
  * @brief 幻覚時の打撃記述テーブル / Weird melee attack types when hallucinating
  */
 #ifdef JP
-const cptr silly_attacks[MAX_SILLY_ATTACK] =
+const concptr silly_attacks[MAX_SILLY_ATTACK] =
 {
        "に小便をかけられた。",
        "があなたの回りを3回回ってワンと言った。",
@@ -5384,7 +5319,7 @@ const cptr silly_attacks[MAX_SILLY_ATTACK] =
 /*!
  * @brief 幻覚時の打撃記述テーブル(フォーマットつき) / Weird melee attack types when hallucinating (%s for strfmt())
  */
-const cptr silly_attacks2[MAX_SILLY_ATTACK] =
+const concptr silly_attacks2[MAX_SILLY_ATTACK] =
 {
        "%sに小便をかけた。",
        "%sの回りを3回回ってワンと言った。",
@@ -5429,7 +5364,7 @@ const cptr silly_attacks2[MAX_SILLY_ATTACK] =
        "言った。「変愚蛮怒、絶賛公開中！」",
 };
 #else
-const cptr silly_attacks[MAX_SILLY_ATTACK] =
+const concptr silly_attacks[MAX_SILLY_ATTACK] =
 {
        "smothers",
        "hugs",
@@ -5473,7 +5408,7 @@ const cptr silly_attacks[MAX_SILLY_ATTACK] =
  * @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 cptr ident_info[] =
+const concptr ident_info[] =
 {
 #ifdef JP
        " :暗闇",
@@ -6139,7 +6074,7 @@ const activation_type activation_info[] =
 /*!
  * @brief ランダムアーティファクトのバイアス名称テーブル
  */
-const cptr artifact_bias_name[MAX_BIAS] =
+const concptr artifact_bias_name[MAX_BIAS] =
 {
        "なし",
        "電撃",
@@ -6163,7 +6098,7 @@ const cptr artifact_bias_name[MAX_BIAS] =
        "レンジャー",
 };
 #else
-const cptr artifact_bias_name[MAX_BIAS] =
+const concptr artifact_bias_name[MAX_BIAS] =
 {
        "None",
        "Elec",