OSDN Git Service

[Refactor] #37353 メッセージ整理。
[hengband/hengband.git] / src / rooms-pitnest.c
index 32c52b4..a19c470 100644 (file)
@@ -572,7 +572,7 @@ static bool vault_aux_dark_elf(MONRACE_IDX r_idx)
 * @param allow_flag_mask 生成が許されるpit/nestのビット配列\r
 * @return 選択されたpit/nestのID、選択失敗した場合-1を返す。\r
 */\r
-static int pick_vault_type(vault_aux_type *l_ptr, s16b allow_flag_mask)\r
+static int pick_vault_type(vault_aux_type *l_ptr, BIT_FLAGS16 allow_flag_mask)\r
 {\r
        int tmp, total, count;\r
 \r
@@ -658,25 +658,14 @@ static cptr pit_subtype_string(int type, bool nest)
                case PIT_TYPE_DRAGON:\r
                        switch (vault_aux_dragon_mask4)\r
                        {\r
-#ifdef JP\r
-                       case RF4_BR_ACID: strcpy(inner_buf, "(酸)");   break;\r
-                       case RF4_BR_ELEC: strcpy(inner_buf, "(稲妻)"); break;\r
-                       case RF4_BR_FIRE: strcpy(inner_buf, "(火炎)"); break;\r
-                       case RF4_BR_COLD: strcpy(inner_buf, "(冷気)"); break;\r
-                       case RF4_BR_POIS: strcpy(inner_buf, "(毒)");   break;\r
-                       case (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | RF4_BR_COLD | RF4_BR_POIS) :\r
-                               strcpy(inner_buf, "(万色)"); break;\r
-                       default: strcpy(inner_buf, "(未定義)"); break;\r
-#else\r
-                       case RF4_BR_ACID: strcpy(inner_buf, "(acid)");      break;\r
-                       case RF4_BR_ELEC: strcpy(inner_buf, "(lightning)"); break;\r
-                       case RF4_BR_FIRE: strcpy(inner_buf, "(fire)");      break;\r
-                       case RF4_BR_COLD: strcpy(inner_buf, "(frost)");     break;\r
-                       case RF4_BR_POIS: strcpy(inner_buf, "(poison)");    break;\r
-                       case (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | RF4_BR_COLD | RF4_BR_POIS) :\r
-                               strcpy(inner_buf, "(multi-hued)"); break;\r
-                       default: strcpy(inner_buf, "(undefined)"); break;\r
-#endif\r
+                               case RF4_BR_ACID: strcpy(inner_buf, _("(酸)", "(acid)"));   break;\r
+                               case RF4_BR_ELEC: strcpy(inner_buf, _("(稲妻)", "(lightning)")); break;\r
+                               case RF4_BR_FIRE: strcpy(inner_buf, _("(火炎)", "(fire)")); break;\r
+                               case RF4_BR_COLD: strcpy(inner_buf, _("(冷気)", "(frost)")); break;\r
+                               case RF4_BR_POIS: strcpy(inner_buf, _("(毒)", "(poison)"));   break;\r
+                               case (RF4_BR_ACID | RF4_BR_ELEC | RF4_BR_FIRE | RF4_BR_COLD | RF4_BR_POIS) :\r
+                                       strcpy(inner_buf, _("(万色)", "(multi-hued)")); break;\r
+                               default: strcpy(inner_buf, _("(未定義)", "(undefined)")); break;\r
                        }\r
                        break;\r
                }\r