[Refactor] #37353 メッセージ整理。

Refactor messages.

diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c
index a19c470..6ee68da 100644 (file)
--- a/src/rooms-pitnest.c
+++ b/src/rooms-pitnest.c
@@ -689,8 +689,8 @@ static cptr pit_subtype_string(int type, bool nest)
 static bool ang_sort_comp_nest_mon_info(vptr u, vptr v, int a, int b)\r
 {\r
        nest_mon_info_type *nest_mon_info = (nest_mon_info_type *)u;\r
-       int w1 = nest_mon_info[a].r_idx;\r
-       int w2 = nest_mon_info[b].r_idx;\r
+       MONSTER_IDX w1 = nest_mon_info[a].r_idx;\r
+       MONSTER_IDX w2 = nest_mon_info[b].r_idx;\r
        monster_race *r1_ptr = &r_info[w1];\r
        monster_race *r2_ptr = &r_info[w2];\r
        int z1, z2;\r
@@ -745,61 +745,33 @@ static void ang_sort_swap_nest_mon_info(vptr u, vptr v, int a, int b)
 /*!nest情報テーブル*/\r
 static vault_aux_type nest_types[] =\r
 {\r
-#ifdef JP\r
-{ "クローン",     vault_aux_clone,    vault_prep_clone,   5, 3 },\r
-{ "ゼリー",       vault_aux_jelly,    NULL,               5, 6 },\r
-{ "シンボル(善)", vault_aux_symbol_g, vault_prep_symbol, 25, 2 },\r
-{ "シンボル(悪)", vault_aux_symbol_e, vault_prep_symbol, 25, 2 },\r
-{ "ミミック",     vault_aux_mimic,    NULL,              30, 4 },\r
-{ "狂気",         vault_aux_cthulhu,  NULL,              70, 2 },\r
-{ "犬小屋",       vault_aux_kennel,   NULL,              45, 4 },\r
-{ "動物園",       vault_aux_animal,   NULL,              35, 5 },\r
-{ "教会",         vault_aux_chapel_g, NULL,              75, 4 },\r
-{ "アンデッド",   vault_aux_undead,   NULL,              75, 5 },\r
-{ NULL,           NULL,               NULL,               0, 0 },\r
-#else\r
-{ "clone",        vault_aux_clone,    vault_prep_clone,   5, 3 },\r
-{ "jelly",        vault_aux_jelly,    NULL,               5, 6 },\r
-{ "symbol good",  vault_aux_symbol_g, vault_prep_symbol, 25, 2 },\r
-{ "symbol evil",  vault_aux_symbol_e, vault_prep_symbol, 25, 2 },\r
-{ "mimic",        vault_aux_mimic,    NULL,              30, 4 },\r
-{ "lovecraftian", vault_aux_cthulhu,  NULL,              70, 2 },\r
-{ "kennel",       vault_aux_kennel,   NULL,              45, 4 },\r
-{ "animal",       vault_aux_animal,   NULL,              35, 5 },\r
-{ "chapel",       vault_aux_chapel_g, NULL,              75, 4 },\r
-{ "undead",       vault_aux_undead,   NULL,              75, 5 },\r
-{ NULL,           NULL,               NULL,               0, 0 },\r
-#endif\r
+       { _("クローン", "clone"),      vault_aux_clone,    vault_prep_clone,   5, 3 },\r
+       { _("ゼリー", "jelly"),        vault_aux_jelly,    NULL,               5, 6 },\r
+       { _("シンボル(善)", "symbol good"), vault_aux_symbol_g, vault_prep_symbol, 25, 2 },\r
+       { _("シンボル(悪)", "symbol evil"), vault_aux_symbol_e, vault_prep_symbol, 25, 2 },\r
+       { _("ミミック", "mimic"),      vault_aux_mimic,    NULL,              30, 4 },\r
+       { _("狂気", "lovecraftian"),   vault_aux_cthulhu,  NULL,              70, 2 },\r
+       { _("犬小屋", "kennel"),       vault_aux_kennel,   NULL,              45, 4 },\r
+       { _("動物園", "animal"),       vault_aux_animal,   NULL,              35, 5 },\r
+       { _("教会", "chapel"),         vault_aux_chapel_g, NULL,              75, 4 },\r
+       { _("アンデッド", "undead"),   vault_aux_undead,   NULL,              75, 5 },\r
+       { NULL,           NULL,               NULL,               0, 0 },\r
 };\r
 \r
 /*!pit情報テーブル*/\r
 static vault_aux_type pit_types[] =\r
 {\r
-#ifdef JP\r
-{ "オーク",       vault_aux_orc,      NULL,               5, 6 },\r
-{ "トロル",       vault_aux_troll,    NULL,              20, 6 },\r
-{ "ジャイアント", vault_aux_giant,    NULL,              50, 6 },\r
-{ "狂気",         vault_aux_cthulhu,  NULL,              80, 2 },\r
-{ "シンボル(善)", vault_aux_symbol_g, vault_prep_symbol, 70, 1 },\r
-{ "シンボル(悪)", vault_aux_symbol_e, vault_prep_symbol, 70, 1 },\r
-{ "教会",         vault_aux_chapel_g, NULL,              65, 2 },\r
-{ "ドラゴン",     vault_aux_dragon,   vault_prep_dragon, 70, 6 },\r
-{ "デーモン",     vault_aux_demon,    NULL,              80, 6 },\r
-{ "ダークエルフ", vault_aux_dark_elf, NULL,              45, 4 },\r
-{ NULL,           NULL,               NULL,               0, 0 },\r
-#else\r
-{ "orc",          vault_aux_orc,      NULL,               5, 6 },\r
-{ "troll",        vault_aux_troll,    NULL,              20, 6 },\r
-{ "giant",        vault_aux_giant,    NULL,              50, 6 },\r
-{ "lovecraftian", vault_aux_cthulhu,  NULL,              80, 2 },\r
-{ "symbol good",  vault_aux_symbol_g, vault_prep_symbol, 70, 1 },\r
-{ "symbol evil",  vault_aux_symbol_e, vault_prep_symbol, 70, 1 },\r
-{ "chapel",       vault_aux_chapel_g, NULL,              65, 2 },\r
-{ "dragon",       vault_aux_dragon,   vault_prep_dragon, 70, 6 },\r
-{ "demon",        vault_aux_demon,    NULL,              80, 6 },\r
-{ "dark elf",     vault_aux_dark_elf, NULL,              45, 4 },\r
-{ NULL,           NULL,               NULL,               0, 0 },\r
-#endif\r
+       { _("オーク", "orc"),            vault_aux_orc,      NULL,               5, 6 },\r
+       { _("トロル", "troll"),          vault_aux_troll,    NULL,              20, 6 },\r
+       { _("ジャイアント", "giant"),    vault_aux_giant,    NULL,              50, 6 },\r
+       { _("狂気", "lovecraftian"),     vault_aux_cthulhu,  NULL,              80, 2 },\r
+       { _("シンボル(善)", "symbol good"), vault_aux_symbol_g, vault_prep_symbol, 70, 1 },\r
+       { _("シンボル(悪)", "symbol evil"), vault_aux_symbol_e, vault_prep_symbol, 70, 1 },\r
+       { _("教会", "chapel"),           vault_aux_chapel_g, NULL,              65, 2 },\r
+       { _("ドラゴン", "dragon"),       vault_aux_dragon,   vault_prep_dragon, 70, 6 },\r
+       { _("デーモン", "demon"),        vault_aux_demon,    NULL,              80, 6 },\r
+       { _("ダークエルフ", "dark elf"), vault_aux_dark_elf, NULL,              45, 4 },\r
+       { NULL,           NULL,               NULL,               0, 0 },\r
 };\r
 \r
 \r