OSDN Git Service

[Refactor] #37353 型の置換。 / Type replacement.
[hengband/hengband.git] / src / wizard1.c
index 9f622dd..36394fe 100644 (file)
@@ -128,87 +128,39 @@ static grouper group_item[] =
        { TV_SHIELD,        NULL },
        { TV_CLOAK,         NULL },
 
-#ifdef JP
-       { TV_LITE,          "光源" },
-       { TV_AMULET,        "アミュレット" },
-       { TV_RING,          "指輪" },
-#else
-       { TV_LITE,          "Light Sources" },
-       { TV_AMULET,        "Amulets" },
-       { TV_RING,          "Rings" },
-#endif
-
-#ifdef JP
-       { TV_STAFF,         "杖" },
-       { TV_WAND,          "魔法棒" },
-       { TV_ROD,           "ロッド" },
-#else
-       { TV_STAFF,         "Staffs" },
-       { TV_WAND,          "Wands" },
-       { TV_ROD,           "Rods" },
-#endif
-
-#ifdef JP
-       { TV_SCROLL,        "巻物" },
-       { TV_POTION,        "薬" },
-       { TV_FOOD,          "食料" },
-#else
-       { TV_SCROLL,        "Scrolls" },
-       { TV_POTION,        "Potions" },
-       { TV_FOOD,          "Food" },
-#endif
-
-#ifdef JP
-       { TV_LIFE_BOOK,     "魔法書 (生命)" },
-       { TV_SORCERY_BOOK,  "魔法書 (仙術)" },
-       { TV_NATURE_BOOK,   "魔法書 (自然)" },
-       { TV_CHAOS_BOOK,    "魔法書 (カオス)" },
-       { TV_DEATH_BOOK,    "魔法書 (暗黒)" },
-       { TV_TRUMP_BOOK,    "魔法書 (トランプ)" },
-       { TV_ARCANE_BOOK,   "魔法書 (秘術)" },
-       { TV_CRAFT_BOOK,    "魔法書 (匠)" },
-       { TV_DAEMON_BOOK,   "魔法書 (悪魔)" },
-       { TV_CRUSADE_BOOK,  "魔法書 (破邪)" },
-       { TV_MUSIC_BOOK,    "歌集" },
-       { TV_HISSATSU_BOOK, "武芸の書" },
-       { TV_HEX_BOOK,      "魔法書 (呪術)" },
-#else
-       { TV_LIFE_BOOK,     "Books (Life)" },
-       { TV_SORCERY_BOOK,  "Books (Sorcery)" },
-       { TV_NATURE_BOOK,   "Books (Nature)" },
-       { TV_CHAOS_BOOK,    "Books (Chaos)" },
-       { TV_DEATH_BOOK,    "Books (Death)" },
-       { TV_TRUMP_BOOK,    "Books (Trump)" },
-       { TV_ARCANE_BOOK,   "Books (Arcane)" },
-       { TV_CRAFT_BOOK,    "Books (Craft)" },
-       { TV_DAEMON_BOOK,   "Books (Daemon)" },
-       { TV_CRUSADE_BOOK,  "Books (Crusade)" },
-       { TV_MUSIC_BOOK,    "Song Books" },
-       { TV_HISSATSU_BOOK, "Books (Kendo)" },
-       { TV_HEX_BOOK,      "Books (Hex)" },
-#endif
-
-#ifdef JP
-       { TV_WHISTLE,       "笛" },
-       { TV_CAPTURE,       "キャプチャー・ボール" },
-       { TV_CARD,          "エクスプレスカード" },
-#else
-       { TV_WHISTLE,       "Whistle" },
-       { TV_CAPTURE,       "Capture Ball" },
-       { TV_CARD,          "Express Card" },
-#endif
+       { TV_LITE,          _("光源", "Light Sources") },
+       { TV_AMULET,        _("アミュレット", "Amulets" )},
+       { TV_RING,          _("指輪", "Rings") },
+       { TV_STAFF,         _("杖", "Staffs") },
+       { TV_WAND,          _("魔法棒", "Wands") },
+       { TV_ROD,           _("ロッド", "Rods") },
+       { TV_SCROLL,        _("巻物", "Scrolls") },
+       { TV_POTION,        _("薬", "Potions") },
+       { TV_FOOD,          _("食料", "Food") },
+
+       { TV_LIFE_BOOK,     _("魔法書 (生命)", "Books (Life)") },
+       { TV_SORCERY_BOOK,  _("魔法書 (仙術)", "Books (Sorcery)") },
+       { TV_NATURE_BOOK,   _("魔法書 (自然)", "Books (Nature)") },
+       { TV_CHAOS_BOOK,    _("魔法書 (カオス)", "Books (Chaos)") },
+       { TV_DEATH_BOOK,    _("魔法書 (暗黒)", "Books (Death)") },
+       { TV_TRUMP_BOOK,    _("魔法書 (トランプ)", "Books (Trump)") },
+       { TV_ARCANE_BOOK,   _("魔法書 (秘術)", "Books (Arcane)") },
+       { TV_CRAFT_BOOK,    _("魔法書 (匠)", "Books (Craft)") },
+       { TV_DAEMON_BOOK,   _("魔法書 (悪魔)", "Books (Daemon)") },
+       { TV_CRUSADE_BOOK,  _("魔法書 (破邪)", "Books (Crusade)") },
+       { TV_MUSIC_BOOK,    _("歌集", "Song Books") },
+       { TV_HISSATSU_BOOK, _("武芸の書", "Books (Kendo)") },
+       { TV_HEX_BOOK,      _("魔法書 (呪術)", "Books (Hex)") },
+
+       { TV_WHISTLE,       _("笛", "Whistle") },
+       { TV_CAPTURE,       _("キャプチャー・ボール", "Capture Ball") },
+       { TV_CARD,          _("エクスプレスカード", "Express Card") },
 
        { TV_CHEST,         _("箱", "Chests") },
 
-#ifdef JP
-       { TV_FIGURINE,      "人形" },
-       { TV_STATUE,        "像" },
-       { TV_CORPSE,        "死体" },
-#else
-       { TV_FIGURINE,      "Magical Figurines" },
-       { TV_STATUE,        "Statues" },
-       { TV_CORPSE,        "Corpses" },
-#endif
+       { TV_FIGURINE,      _("人形", "Magical Figurines") },
+       { TV_STATUE,        _("像", "Statues") },
+       { TV_CORPSE,        _("死体", "Corpses") },
 
        { TV_SKELETON,      _("その他", "Misc") },
        { TV_BOTTLE,        NULL },
@@ -238,8 +190,6 @@ static void kind_info(char *buf, char *dam, char *wgt, char *chance, DEPTH *lev,
        object_type forge;
        object_type *q_ptr;
        int i;
-
-       /* Get local object */
        q_ptr = &forge;
 
        /* Prepare a fake item */
@@ -254,22 +204,15 @@ static void kind_info(char *buf, char *dam, char *wgt, char *chance, DEPTH *lev,
        q_ptr->to_h = 0;
        q_ptr->to_d = 0;
 
-
-       /* Level */
        (*lev) = k_info[q_ptr->k_idx].level;
-
-       /* Value */
        (*val) = object_value(q_ptr);
 
-
        /* Hack */
        if (!buf || !dam || !chance || !wgt) return;
 
-
        /* Description (too brief) */
        object_desc(buf, q_ptr, (OD_NAME_ONLY | OD_STORE));
 
-
        /* Misc info */
        strcpy(dam, "");
 
@@ -574,7 +517,7 @@ typedef struct flag_desc flag_desc;
 struct flag_desc
 {
        const int flag;
-       const char *const desc;
+       cptr const desc;
 };
 
 
@@ -1338,33 +1281,18 @@ static void analyze_addition(object_type *o_ptr, char *addition)
        /* Init */
        strcpy(addition, "");
 
-#ifdef JP
-       if ((a_ptr->gen_flags & TRG_XTRA_POWER) && (a_ptr->gen_flags & TRG_XTRA_H_RES)) strcat(addition, "能力and耐性");
+       if ((a_ptr->gen_flags & TRG_XTRA_POWER) && (a_ptr->gen_flags & TRG_XTRA_H_RES)) strcat(addition, _("能力and耐性", "Ability and Resistance"));
        else if (a_ptr->gen_flags & TRG_XTRA_POWER)
        {
-               strcat(addition, "能力");
-               if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, "(1/2でand耐性)");
+               strcat(addition, _("能力", "Ability"));
+               if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, _("(1/2でand耐性)", "(plus Resistance about 1/2)"));
        }
        else if (a_ptr->gen_flags & TRG_XTRA_H_RES)
        {
-               strcat(addition, "耐性");
-               if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, "(1/2でand能力)");
+               strcat(addition, _("耐性", "Resistance"));
+               if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, _("(1/2でand能力)", "(plus Ability about 1/2)"));
        }
-       else if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, "能力or耐性");
-#else
-       if ((a_ptr->gen_flags & TRG_XTRA_POWER) && (a_ptr->gen_flags & TRG_XTRA_H_RES)) strcat(addition, "Ability and Resistance");
-       else if (a_ptr->gen_flags & TRG_XTRA_POWER)
-       {
-               strcat(addition, "Ability");
-               if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, "(plus Resistance about 1/2)");
-       }
-       else if (a_ptr->gen_flags & TRG_XTRA_H_RES)
-       {
-               strcat(addition, "Resistance");
-               if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, "(plus Ability about 1/2)");
-       }
-       else if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, "Ability or Resistance");
-#endif
+       else if (a_ptr->gen_flags & TRG_XTRA_RES_OR_POWER) strcat(addition, _("能力or耐性", "Ability or Resistance"));
 }
 
 
@@ -1620,7 +1548,7 @@ static void spoiler_print_art(obj_desc_list *art_ptr)
  */
 static bool make_fake_artifact(object_type *o_ptr, IDX name1)
 {
-       IDX i;
+       OBJECT_IDX i;
        artifact_type *a_ptr = &a_info[name1];
 
        /* Ignore "empty" artifacts */
@@ -1704,8 +1632,6 @@ static void spoil_artifact(cptr fname)
 
                        /* We only want objects in the current group */
                        if (a_ptr->tval != group_artifact[i].tval) continue;
-
-                       /* Get local object */
                        q_ptr = &forge;
                        object_wipe(q_ptr);
 
@@ -2070,7 +1996,7 @@ static void spoil_out(cptr str)
  * @param str 文字列参照ポインタ
  * @return なし
  */
-static void roff_func(byte attr, cptr str)
+static void roff_func(TERM_COLOR attr, cptr str)
 {
        /* Unused */
        (void)attr;
@@ -2506,13 +2432,11 @@ extern void do_cmd_spoilers(void);
  */
 void do_cmd_spoilers(void)
 {
-       /* Save the screen */
        screen_save();
 
        /* Interact */
        while (1)
        {
-               /* Clear screen */
                Term_clear();
 
                /* Info */
@@ -2533,7 +2457,6 @@ void do_cmd_spoilers(void)
                {
                /* Escape */
                case ESCAPE:
-                       /* Restore the screen */
                        screen_load();
                        return;
 
@@ -2567,8 +2490,7 @@ void do_cmd_spoilers(void)
                        break;
                }
 
-               /* Flush messages */
-               msg_print(NULL);
+               msg_erase();
        }
 }
 
@@ -2632,19 +2554,11 @@ static void spoiler_print_randart(object_type *o_ptr, obj_desc_list *art_ptr)
 
                /* Now deal with the description lists */
 
-#ifdef JP
-               spoiler_outlist("対:", art_ptr->slays, ITEM_SEP);
-               spoiler_outlist("武器属性:", art_ptr->brands, LIST_SEP);
-               spoiler_outlist("免疫:", art_ptr->immunities, ITEM_SEP);
-               spoiler_outlist("耐性:", art_ptr->resistances, ITEM_SEP);
-               spoiler_outlist("維持:", art_ptr->sustains, ITEM_SEP);
-#else
-               spoiler_outlist("Slay", art_ptr->slays, ITEM_SEP);
-               spoiler_outlist("", art_ptr->brands, LIST_SEP);
-               spoiler_outlist("Immunity to", art_ptr->immunities, ITEM_SEP);
-               spoiler_outlist("Resist", art_ptr->resistances, ITEM_SEP);
-               spoiler_outlist("Sustain", art_ptr->sustains, ITEM_SEP);
-#endif
+               spoiler_outlist(_("対:", "Slay"), art_ptr->slays, ITEM_SEP);
+               spoiler_outlist(_("武器属性:", ""), art_ptr->brands, LIST_SEP);
+               spoiler_outlist(_("免疫:", "Immunity to"), art_ptr->immunities, ITEM_SEP);
+               spoiler_outlist(_("耐性:", "Resist"), art_ptr->resistances, ITEM_SEP);
+               spoiler_outlist(_("維持:", "Sustain"), art_ptr->sustains, ITEM_SEP);
                spoiler_outlist("", art_ptr->misc_magic, LIST_SEP);
 
                /* Write out the possible activation at the primary indention level */
@@ -2694,7 +2608,6 @@ void spoil_random_artifact(cptr fname)
 
        char buf[1024];
 
-
        /* Build the filename */
        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, fname);