X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=blobdiff_plain;f=src%2Fcmd6.c;h=ecd16c9168d6aa592060c2d5c2a2099db5bf9dce;hp=89c236ff49df8b53468b4868f663c76638367ef1;hb=97c7a62d7abe963c7a9abcb22a35273101a09081;hpb=c7b2453c02694e8bb0588d7688fe66b64972558a diff --git a/src/cmd6.c b/src/cmd6.c index 89c236ff4..ecd16c916 100644 --- a/src/cmd6.c +++ b/src/cmd6.c @@ -84,7 +84,7 @@ static void do_cmd_eat_food_aux(int item) sound(SOUND_EAT); /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; /* Identity not known yet */ ident = FALSE; @@ -171,12 +171,7 @@ static void do_cmd_eat_food_aux(int item) case SV_FOOD_WEAKNESS: { -#ifdef JP - take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "毒入り食料", -1); -#else - take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "poisonous food", -1); -#endif - + take_hit(DAMAGE_NOESCAPE, damroll(6, 6), _("毒入り食料", "poisonous food"), -1); (void)do_dec_stat(A_STR); ident = TRUE; break; @@ -184,12 +179,7 @@ static void do_cmd_eat_food_aux(int item) case SV_FOOD_SICKNESS: { -#ifdef JP - take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "毒入り食料", -1); -#else - take_hit(DAMAGE_NOESCAPE, damroll(6, 6), "poisonous food", -1); -#endif - + take_hit(DAMAGE_NOESCAPE, damroll(6, 6), _("毒入り食料", "poisonous food"), -1); (void)do_dec_stat(A_CON); ident = TRUE; break; @@ -197,12 +187,7 @@ static void do_cmd_eat_food_aux(int item) case SV_FOOD_STUPIDITY: { -#ifdef JP - take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "毒入り食料", -1); -#else - take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "poisonous food", -1); -#endif - + take_hit(DAMAGE_NOESCAPE, damroll(8, 8), _("毒入り食料", "poisonous food"), -1); (void)do_dec_stat(A_INT); ident = TRUE; break; @@ -210,12 +195,7 @@ static void do_cmd_eat_food_aux(int item) case SV_FOOD_NAIVETY: { -#ifdef JP - take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "毒入り食料", -1); -#else - take_hit(DAMAGE_NOESCAPE, damroll(8, 8), "poisonous food", -1); -#endif - + take_hit(DAMAGE_NOESCAPE, damroll(8, 8), _("毒入り食料", "poisonous food"), -1); (void)do_dec_stat(A_WIS); ident = TRUE; break; @@ -223,12 +203,7 @@ static void do_cmd_eat_food_aux(int item) case SV_FOOD_UNHEALTH: { -#ifdef JP - take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "毒入り食料", -1); -#else - take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "poisonous food", -1); -#endif - + take_hit(DAMAGE_NOESCAPE, damroll(10, 10), _("毒入り食料", "poisonous food"), -1); (void)do_dec_stat(A_CON); ident = TRUE; break; @@ -236,12 +211,7 @@ static void do_cmd_eat_food_aux(int item) case SV_FOOD_DISEASE: { -#ifdef JP - take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "毒入り食料", -1); -#else - take_hit(DAMAGE_NOESCAPE, damroll(10, 10), "poisonous food", -1); -#endif - + take_hit(DAMAGE_NOESCAPE, damroll(10, 10), _("毒入り食料", "poisonous food"), -1); (void)do_dec_stat(A_STR); ident = TRUE; break; @@ -345,12 +315,7 @@ static void do_cmd_eat_food_aux(int item) case SV_FOOD_WAYBREAD: { -#ifdef JP - msg_print("これはひじょうに美味だ。"); -#else - msg_print("That tastes good."); -#endif - + msg_print(_("これはひじょうに美味だ。", "That tastes good.")); (void)set_poisoned(0); (void)hp_player(damroll(4, 8)); ident = TRUE; @@ -413,19 +378,12 @@ static void do_cmd_eat_food_aux(int item) { /* Reduced nutritional benefit */ (void)set_food(p_ptr->food + (o_ptr->pval / 10)); -#ifdef JP -msg_print("あなたのような者にとって食糧など僅かな栄養にしかならない。"); -#else - msg_print("Mere victuals hold scant sustenance for a being such as yourself."); -#endif + msg_print(_("あなたのような者にとって食糧など僅かな栄養にしかならない。", + "Mere victuals hold scant sustenance for a being such as yourself.")); if (p_ptr->food < PY_FOOD_ALERT) /* Hungry */ -#ifdef JP -msg_print("あなたの飢えは新鮮な血によってのみ満たされる！"); -#else - msg_print("Your hunger can only be satisfied with fresh blood!"); -#endif - + msg_print(_("あなたの飢えは新鮮な血によってのみ満たされる！", + "Your hunger can only be satisfied with fresh blood!")); } else if ((prace_is_(RACE_SKELETON) || prace_is_(RACE_GOLEM) || @@ -438,29 +396,15 @@ msg_print("あなたの飢えは新鮮な血によってのみ満たされる！ if (o_ptr->tval == TV_STAFF && (item < 0) && (o_ptr->number > 1)) { -#ifdef JP - msg_print("まずは杖を拾わなければ。"); -#else - msg_print("You must first pick up the staffs."); -#endif + msg_print(_("まずは杖を拾わなければ。", "You must first pick up the staffs.")); return; } - -#ifdef JP - staff = (o_ptr->tval == TV_STAFF) ? "杖" : "魔法棒"; -#else - staff = (o_ptr->tval == TV_STAFF) ? "staff" : "wand"; -#endif + staff = (o_ptr->tval == TV_STAFF) ? _("杖", "staff") : _("魔法棒", "wand"); /* "Eat" charges */ if (o_ptr->pval == 0) { -#ifdef JP - msg_format("この%sにはもう魔力が残っていない。", staff); -#else - msg_format("The %s has no charges left.", staff); -#endif - + msg_format(_("この%sにはもう魔力が残っていない。", "The %s has no charges left."), staff); o_ptr->ident |= (IDENT_EMPTY); /* Combine / Reorder the pack (later) */ @@ -469,12 +413,7 @@ msg_print("あなたの飢えは新鮮な血によってのみ満たされる！ return; } - -#ifdef JP - msg_format("あなたは%sの魔力をエネルギー源として吸収した。", staff); -#else - msg_format("You absorb mana of the %s as your energy.", staff); -#endif + msg_format(_("あなたは%sの魔力をエネルギー源として吸収した。", "You absorb mana of the %s as your energy."), staff); /* Use a single charge */ o_ptr->pval--; @@ -507,11 +446,7 @@ msg_print("あなたの飢えは新鮮な血によってのみ満たされる！ item = inven_carry(q_ptr); /* Message */ -#ifdef JP - msg_format("杖をまとめなおした。"); -#else - msg_print("You unstack your staff."); -#endif + msg_format(_("杖をまとめなおした。", "You unstack your staff.")); } /* Describe charges in the pack */ @@ -539,14 +474,8 @@ msg_print("あなたの飢えは新鮮な血によってのみ満たされる！ { /* Drain vitality of humanoids */ char o_name[MAX_NLEN]; - object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); - -#ifdef JP - msg_format("%sは燃え上り灰になった。精力を吸収した気がする。", o_name); -#else - msg_format("%^s is burnt to ashes. You absorb its vitality!", o_name); -#endif + msg_format(_("%sは燃え上り灰になった。精力を吸収した気がする。", "%^s is burnt to ashes. You absorb its vitality!"), o_name); (void)set_food(PY_FOOD_MAX - 1); } else if (prace_is_(RACE_SKELETON)) @@ -555,11 +484,7 @@ msg_print("あなたの飢えは新鮮な血によってのみ満たされる！ if (o_ptr->tval == TV_SKELETON || (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON)) { -#ifdef JP - msg_print("あなたは骨で自分の体を補った。"); -#else - msg_print("Your body absorbs the bone."); -#endif + msg_print(_("あなたは骨で自分の体を補った。", "Your body absorbs the bone.")); set_food(p_ptr->food + 5000); } else @@ -570,28 +495,18 @@ msg_print("あなたの飢えは新鮮な血によってのみ満たされる！ { object_type forge; object_type *q_ptr = &forge; - -#ifdef JP -msg_print("食べ物がアゴを素通りして落ちた！"); -#else - msg_print("The food falls through your jaws!"); -#endif - + + msg_print(_("食べ物がアゴを素通りして落ちた！", "The food falls through your jaws!")); /* Create the item */ object_prep(q_ptr, lookup_kind(o_ptr->tval, o_ptr->sval)); /* Drop the object from heaven */ - (void)drop_near(q_ptr, -1, py, px); + (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x); } else { -#ifdef JP -msg_print("食べ物がアゴを素通りして落ち、消えた！"); -#else - msg_print("The food falls through your jaws and vanishes!"); -#endif - + msg_print(_("食べ物がアゴを素通りして落ち、消えた！", "The food falls through your jaws and vanishes!")); } } else if (prace_is_(RACE_GOLEM) || @@ -602,12 +517,7 @@ msg_print("食べ物がアゴを素通りして落ち、消えた！"); prace_is_(RACE_SPECTRE) || (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING)) { -#ifdef JP -msg_print("生者の食物はあなたにとってほとんど栄養にならない。"); -#else - msg_print("The food of mortals is poor sustenance for you."); -#endif - + msg_print(_("生者の食物はあなたにとってほとんど栄養にならない。", "The food of mortals is poor sustenance for you.")); set_food(p_ptr->food + ((o_ptr->pval) / 20)); } else if (o_ptr->tval == TV_FOOD && o_ptr->sval == SV_FOOD_WAYBREAD) @@ -688,7 +598,7 @@ static bool item_tester_hook_eatable(object_type *o_ptr) */ void do_cmd_eat_food(void) { - int item; + OBJECT_IDX item; cptr q, s; @@ -701,13 +611,8 @@ void do_cmd_eat_food(void) item_tester_hook = item_tester_hook_eatable; /* Get an item */ -#ifdef JP - q = "どれを食べますか? "; - s = "食べ物がない。"; -#else - q = "Eat which item? "; - s = "You have nothing to eat."; -#endif + q = _("どれを食べますか? ", "Eat which item? "); + s = _("食べ物がない。", "You have nothing to eat."); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return; @@ -731,16 +636,12 @@ static void do_cmd_quaff_potion_aux(int item) /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; if (world_player) { if (flush_failure) flush(); -#ifdef JP - msg_print("瓶から水が流れ出てこない！"); -#else - msg_print("The potion doesn't flow out from a bottle."); -#endif + msg_print(_("瓶から水が流れ出てこない！", "The potion doesn't flow out from a bottle.")); sound(SOUND_FAIL); return; @@ -804,45 +705,31 @@ static void do_cmd_quaff_potion_aux(int item) { switch (q_ptr->sval) { -#ifdef JP /* 飲みごたえをオリジナルより細かく表現 */ case SV_POTION_WATER: - msg_print("口の中がさっぱりした。"); - msg_print("のどの渇きが少しおさまった。"); + msg_print(_("口の中がさっぱりした。", "")); + msg_print(_("のどの渇きが少しおさまった。", "You feel less thirsty.")); ident = TRUE; break; case SV_POTION_APPLE_JUICE: - msg_print("甘くてサッパリとしていて、とてもおいしい。"); - msg_print("のどの渇きが少しおさまった。"); + msg_print(_("甘くてサッパリとしていて、とてもおいしい。", "")); + msg_print(_("のどの渇きが少しおさまった。", "You feel less thirsty.")); ident = TRUE; break; case SV_POTION_SLIME_MOLD: - msg_print("なんとも不気味な味だ。"); - msg_print("のどの渇きが少しおさまった。"); + msg_print(_("なんとも不気味な味だ。", "")); + msg_print(_("のどの渇きが少しおさまった。", "You feel less thirsty.")); ident = TRUE; break; -#else - case SV_POTION_WATER: - case SV_POTION_APPLE_JUICE: - case SV_POTION_SLIME_MOLD: - msg_print("You feel less thirsty."); - ident = TRUE; - break; -#endif - case SV_POTION_SLOWNESS: if (set_slow(randint1(25) + 15, FALSE)) ident = TRUE; break; case SV_POTION_SALT_WATER: -#ifdef JP - msg_print("うぇ！思わず吐いてしまった。"); -#else - msg_print("The potion makes you vomit!"); -#endif + msg_print(_("うぇ！思わず吐いてしまった。", "The potion makes you vomit!")); if (!(prace_is_(RACE_GOLEM) || prace_is_(RACE_ZOMBIE) || @@ -907,14 +794,8 @@ static void do_cmd_quaff_potion_aux(int item) else wiz_dark(); (void)teleport_player_aux(100, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE); wiz_dark(); -#ifdef JP - msg_print("知らない場所で目が醒めた。頭痛がする。"); - msg_print("何も思い出せない。どうやってここへ来たのかも分からない！"); -#else - msg_print("You wake up somewhere with a sore head..."); - msg_print("You can't remember a thing, or how you got here!"); -#endif - + msg_print(_("知らない場所で目が醒めた。頭痛がする。", "You wake up somewhere with a sore head...")); + msg_print(_("何も思い出せない。どうやってここへ来たのかも分からない！", "You can't remember a thing, or how you got here!")); } } break; @@ -922,30 +803,14 @@ static void do_cmd_quaff_potion_aux(int item) case SV_POTION_SLEEP: if (!p_ptr->free_act) { -#ifdef JP - msg_print("あなたは眠ってしまった。"); -#else - msg_print("You fall asleep."); -#endif - + msg_print(_("あなたは眠ってしまった。", "You fall asleep.")); if (ironman_nightmare) { -#ifdef JP -msg_print("恐ろしい光景が頭に浮かんできた。"); -#else - msg_print("A horrible vision enters your mind."); -#endif - - - /* Pick a nightmare */ - get_mon_num_prep(get_nightmare, NULL); + msg_print(_("恐ろしい光景が頭に浮かんできた。", "A horrible vision enters your mind.")); /* Have some nightmares */ - have_nightmare(get_mon_num(MAX_DEPTH)); - - /* Remove the monster restriction */ - get_mon_num_prep(NULL, NULL); + sanity_blast(NULL, FALSE); } if (set_paralyzed(p_ptr->paralyzed + randint0(4) + 4)) { @@ -957,11 +822,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); case SV_POTION_LOSE_MEMORIES: if (!p_ptr->hold_exp && (p_ptr->exp > 0)) { -#ifdef JP - msg_print("過去の記憶が薄れていく気がする。"); -#else - msg_print("You feel your memories fade."); -#endif + msg_print(_("過去の記憶が薄れていく気がする。", "You feel your memories fade.")); chg_virtue(V_KNOWLEDGE, -5); lose_exp(p_ptr->exp / 4); @@ -970,13 +831,8 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); break; case SV_POTION_RUINATION: -#ifdef JP - msg_print("身も心も弱ってきて、精気が抜けていくようだ。"); - take_hit(DAMAGE_LOSELIFE, damroll(10, 10), "破滅の薬", -1); -#else - msg_print("Your nerves and muscles feel weak and lifeless!"); - take_hit(DAMAGE_LOSELIFE, damroll(10, 10), "a potion of Ruination", -1); -#endif + msg_print(_("身も心も弱ってきて、精気が抜けていくようだ。", "Your nerves and muscles feel weak and lifeless!")); + take_hit(DAMAGE_LOSELIFE, damroll(10, 10), _("破滅の薬", "a potion of Ruination"), -1); (void)dec_stat(A_DEX, 25, TRUE); (void)dec_stat(A_WIS, 25, TRUE); @@ -1012,13 +868,8 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); break; case SV_POTION_DETONATIONS: -#ifdef JP - msg_print("体の中で激しい爆発が起きた！"); - take_hit(DAMAGE_NOESCAPE, damroll(50, 20), "爆発の薬", -1); -#else - msg_print("Massive explosions rupture your body!"); - take_hit(DAMAGE_NOESCAPE, damroll(50, 20), "a potion of Detonation", -1); -#endif + msg_print(_("体の中で激しい爆発が起きた！", "Massive explosions rupture your body!")); + take_hit(DAMAGE_NOESCAPE, damroll(50, 20), _("爆発の薬", "a potion of Detonation"), -1); (void)set_stun(p_ptr->stun + 75); (void)set_cut(p_ptr->cut + 5000); @@ -1028,14 +879,8 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); case SV_POTION_DEATH: chg_virtue(V_VITALITY, -1); chg_virtue(V_UNLIFE, 5); -#ifdef JP - msg_print("死の予感が体中を駆けめぐった。"); - take_hit(DAMAGE_LOSELIFE, 5000, "死の薬", -1); -#else - msg_print("A feeling of Death flows through your body."); - take_hit(DAMAGE_LOSELIFE, 5000, "a potion of Death", -1); -#endif - + msg_print(_("死の予感が体中を駆けめぐった。", "A feeling of Death flows through your body.")); + take_hit(DAMAGE_LOSELIFE, 5000, _("死の薬", "a potion of Death"), -1); ident = TRUE; break; @@ -1150,12 +995,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); case SV_POTION_LIFE: chg_virtue(V_VITALITY, 1); chg_virtue(V_UNLIFE, -5); -#ifdef JP - msg_print("体中に生命力が満ちあふれてきた！"); -#else - msg_print("You feel life flow through your body!"); -#endif - + msg_print(_("体中に生命力が満ちあふれてきた！", "You feel life flow through your body!")); restore_level(); (void)set_poisoned(0); (void)set_blind(0); @@ -1186,15 +1026,11 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); } for (; i < EATER_EXT*3; i++) { - int k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2); + KIND_OBJECT_IDX k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2); p_ptr->magic_num1[i] -= ((p_ptr->magic_num2[i] < 10) ? EATER_ROD_CHARGE*3 : p_ptr->magic_num2[i]*EATER_ROD_CHARGE/3)*k_info[k_idx].pval; if (p_ptr->magic_num1[i] < 0) p_ptr->magic_num1[i] = 0; } -#ifdef JP - msg_print("頭がハッキリとした。"); -#else - msg_print("You feel your head clear."); -#endif + msg_print(_("頭がハッキリとした。", "You feel your head clear.")); p_ptr->window |= (PW_PLAYER); ident = TRUE; } @@ -1202,11 +1038,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); { p_ptr->csp = p_ptr->msp; p_ptr->csp_frac = 0; -#ifdef JP - msg_print("頭がハッキリとした。"); -#else - msg_print("You feel your head clear."); -#endif + msg_print(_("頭がハッキリとした。", "You feel your head clear.")); p_ptr->redraw |= (PR_MANA); p_ptr->window |= (PW_PLAYER); @@ -1278,12 +1110,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); break; case SV_POTION_ENLIGHTENMENT: -#ifdef JP - msg_print("自分の置かれている状況が脳裏に浮かんできた..."); -#else - msg_print("An image of your surroundings forms in your mind..."); -#endif - + msg_print(_("自分の置かれている状況が脳裏に浮かんできた...", "An image of your surroundings forms in your mind...")); chg_virtue(V_KNOWLEDGE, 1); chg_virtue(V_ENLIGHTEN, 1); wiz_lite(FALSE); @@ -1291,12 +1118,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); break; case SV_POTION_STAR_ENLIGHTENMENT: -#ifdef JP - msg_print("更なる啓蒙を感じた..."); -#else - msg_print("You begin to feel more enlightened..."); -#endif - + msg_print(_("更なる啓蒙を感じた...", "You begin to feel more enlightened...")); chg_virtue(V_KNOWLEDGE, 1); chg_virtue(V_ENLIGHTEN, 2); msg_print(NULL); @@ -1315,12 +1137,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); break; case SV_POTION_SELF_KNOWLEDGE: -#ifdef JP - msg_print("自分自身のことが少しは分かった気がする..."); -#else - msg_print("You begin to know yourself a little better..."); -#endif - + msg_print(_("自分自身のことが少しは分かった気がする...", "You begin to know yourself a little better...")); msg_print(NULL); self_knowledge(); ident = TRUE; @@ -1333,12 +1150,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); { s32b ee = (p_ptr->exp / 2) + 10; if (ee > 100000L) ee = 100000L; -#ifdef JP - msg_print("更に経験を積んだような気がする。"); -#else - msg_print("You feel more experienced."); -#endif - + msg_print(_("更に経験を積んだような気がする。", "You feel more experienced.")); gain_exp(ee); ident = TRUE; } @@ -1372,20 +1184,7 @@ msg_print("恐ろしい光景が頭に浮かんできた。"); do_cmd_rerate(FALSE); get_max_stats(); p_ptr->update |= PU_BONUS; - if (p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) - { - chg_virtue(V_CHANCE, -5); -#ifdef JP -msg_print("全ての突然変異が治った。"); -#else - msg_print("You are cured of all mutations."); -#endif - - p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0; - p_ptr->update |= PU_BONUS; - handle_stuff(); - mutant_regenerate_mod = calc_mutant_regenerate_mod(); - } + lose_all_mutations(); ident = TRUE; break; @@ -1396,11 +1195,7 @@ msg_print("全ての突然変異が治った。"); break; case SV_POTION_TSUYOSHI: -#ifdef JP -msg_print("「オクレ兄さん！」"); -#else - msg_print("Brother OKURE!"); -#endif + msg_print(_("「オクレ兄さん！」", "Brother OKURE!")); msg_print(NULL); p_ptr->tsuyoshi = 1; (void)set_tsuyoshi(0, TRUE); @@ -1414,16 +1209,7 @@ msg_print("「オクレ兄さん！」"); case SV_POTION_POLYMORPH: if ((p_ptr->muta1 || p_ptr->muta2 || p_ptr->muta3) && one_in_(23)) { - chg_virtue(V_CHANCE, -5); -#ifdef JP -msg_print("全ての突然変異が治った。"); -#else - msg_print("You are cured of all mutations."); -#endif - - p_ptr->muta1 = p_ptr->muta2 = p_ptr->muta3 = 0; - p_ptr->update |= PU_BONUS; - handle_stuff(); + lose_all_mutations(); } else { @@ -1442,13 +1228,8 @@ msg_print("全ての突然変異が治った。"); if (prace_is_(RACE_SKELETON)) { -#ifdef JP -msg_print("液体の一部はあなたのアゴを素通りして落ちた！"); -#else - msg_print("Some of the fluid falls through your jaws!"); -#endif - - (void)potion_smash_effect(0, py, px, q_ptr->k_idx); + msg_print(_("液体の一部はあなたのアゴを素通りして落ちた！", "Some of the fluid falls through your jaws!")); + (void)potion_smash_effect(0, p_ptr->y, p_ptr->x, q_ptr->k_idx); } /* Combine / Reorder the pack (later) */ @@ -1495,11 +1276,7 @@ msg_print("液体の一部はあなたのアゴを素通りして落ちた！"); case RACE_ANDROID: if (q_ptr->tval == TV_FLASK) { -#ifdef JP - msg_print("オイルを補給した。"); -#else - msg_print("You replenish yourself with the oil."); -#endif + msg_print(_("オイルを補給した。", "You replenish yourself with the oil.")); set_food(p_ptr->food + 5000); } else @@ -1508,11 +1285,7 @@ msg_print("液体の一部はあなたのアゴを素通りして落ちた！"); } break; case RACE_ENT: -#ifdef JP - msg_print("水分を取り込んだ。"); -#else - msg_print("You are moistened."); -#endif + msg_print(_("水分を取り込んだ。", "You are moistened.")); set_food(MIN(p_ptr->food + q_ptr->pval + MAX(0, q_ptr->pval * 10) + 2000, PY_FOOD_MAX - 1)); break; default: @@ -1560,7 +1333,7 @@ static bool item_tester_hook_quaff(object_type *o_ptr) */ void do_cmd_quaff_potion(void) { - int item; + OBJECT_IDX item; cptr q, s; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) @@ -1572,13 +1345,8 @@ void do_cmd_quaff_potion(void) item_tester_hook = item_tester_hook_quaff; /* Get an item */ -#ifdef JP - q = "どの薬を飲みますか? "; - s = "飲める薬がない。"; -#else - q = "Quaff which potion? "; - s = "You have no potions to quaff."; -#endif + q = _("どの薬を飲みますか? ", "Quaff which potion? "); + s = _("飲める薬がない。", "You have no potions to quaff."); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return; @@ -1620,28 +1388,19 @@ static void do_cmd_read_scroll_aux(int item, bool known) /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; if (world_player) { if (flush_failure) flush(); -#ifdef JP - msg_print("止まった時の中ではうまく働かないようだ。"); -#else - msg_print("Nothing happen."); -#endif - + msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen.")); sound(SOUND_FAIL); return; } if (p_ptr->pclass == CLASS_BERSERKER) { -#ifdef JP - msg_print("巻物なんて読めない。"); -#else - msg_print("You cannot read."); -#endif + msg_print(_("巻物なんて読めない。", "You cannot read.")); return; } @@ -1676,12 +1435,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) case SV_SCROLL_AGGRAVATE_MONSTER: { -#ifdef JP - msg_print("カン高くうなる様な音が辺りを覆った。"); -#else - msg_print("There is a high pitched humming noise."); -#endif - + msg_print(_("カン高くうなる様な音が辺りを覆った。", "There is a high pitched humming noise.")); aggravate_monsters(0); ident = TRUE; break; @@ -1710,7 +1464,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) { for (k = 0; k < randint1(3); k++) { - if (summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET))) + if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET))) { ident = TRUE; } @@ -1722,7 +1476,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) { for (k = 0; k < randint1(3); k++) { - if (summon_specific(0, py, px, dun_level, SUMMON_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET))) + if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET))) { ident = TRUE; } @@ -1732,7 +1486,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) case SV_SCROLL_SUMMON_PET: { - if (summon_specific(-1, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_FORCE_PET))) + if (summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_FORCE_PET))) { ident = TRUE; } @@ -1741,7 +1495,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) case SV_SCROLL_SUMMON_KIN: { - if (summon_kin_player(p_ptr->lev, py, px, (PM_FORCE_PET | PM_ALLOW_GROUP))) + if (summon_kin_player(p_ptr->lev, p_ptr->y, p_ptr->x, (PM_FORCE_PET | PM_ALLOW_GROUP))) { ident = TRUE; } @@ -1750,7 +1504,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) case SV_SCROLL_TRAP_CREATION: { - if (trap_creation(py, px)) ident = TRUE; + if (trap_creation(p_ptr->y, p_ptr->x)) ident = TRUE; break; } @@ -1800,12 +1554,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) { if (remove_curse()) { -#ifdef JP - msg_print("誰かに見守られているような気がする。"); -#else - msg_print("You feel as if someone is watching over you."); -#endif - + msg_print(_("誰かに見守られているような気がする。", "You feel as if someone is watching over you.")); ident = TRUE; } break; @@ -1815,11 +1564,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) { if (remove_all_curse()) { -#ifdef JP - msg_print("誰かに見守られているような気がする。"); -#else - msg_print("You feel as if someone is watching over you."); -#endif + msg_print(_("誰かに見守られているような気がする。", "You feel as if someone is watching over you.")); } ident = TRUE; break; @@ -1947,12 +1692,7 @@ static void do_cmd_read_scroll_aux(int item, bool known) { if (!(p_ptr->special_attack & ATTACK_CONFUSE)) { -#ifdef JP - msg_print("手が輝き始めた。"); -#else - msg_print("Your hands begin to glow."); -#endif - + msg_print(_("手が輝き始めた。", "Your hands begin to glow.")); p_ptr->special_attack |= ATTACK_CONFUSE; p_ptr->redraw |= (PR_STATUS); ident = TRUE; @@ -1982,15 +1722,10 @@ static void do_cmd_read_scroll_aux(int item, bool known) case SV_SCROLL_STAR_DESTRUCTION: { - if (destroy_area(py, px, 13 + randint0(5), FALSE)) + if (destroy_area(p_ptr->y, p_ptr->x, 13 + randint0(5), FALSE)) ident = TRUE; else -#ifdef JP -msg_print("ダンジョンが揺れた..."); -#else - msg_print("The dungeon trembles..."); -#endif - + msg_print(_("ダンジョンが揺れた...", "The dungeon trembles...")); break; } @@ -2040,14 +1775,14 @@ msg_print("ダンジョンが揺れた..."); case SV_SCROLL_ACQUIREMENT: { - acquirement(py, px, 1, TRUE, FALSE, FALSE); + acquirement(p_ptr->y, p_ptr->x, 1, TRUE, FALSE, FALSE); ident = TRUE; break; } case SV_SCROLL_STAR_ACQUIREMENT: { - acquirement(py, px, randint1(2) + 1, TRUE, FALSE, FALSE); + acquirement(p_ptr->y, p_ptr->x, randint1(2) + 1, TRUE, FALSE, FALSE); ident = TRUE; break; } @@ -2058,11 +1793,7 @@ msg_print("ダンジョンが揺れた..."); fire_ball(GF_FIRE, 0, 666, 4); /* Note: "Double" damage since it is centered on the player ... */ if (!(IS_OPPOSE_FIRE() || p_ptr->resist_fire || p_ptr->immune_fire)) -#ifdef JP -take_hit(DAMAGE_NOESCAPE, 50+randint1(50), "炎の巻物", -1); -#else - take_hit(DAMAGE_NOESCAPE, 50 + randint1(50), "a Scroll of Fire", -1); -#endif + take_hit(DAMAGE_NOESCAPE, 50+randint1(50), _("炎の巻物", "a Scroll of Fire"), -1); ident = TRUE; break; @@ -2073,11 +1804,7 @@ take_hit(DAMAGE_NOESCAPE, 50+randint1(50), "炎の巻物", -1); { fire_ball(GF_ICE, 0, 777, 4); if (!(IS_OPPOSE_COLD() || p_ptr->resist_cold || p_ptr->immune_cold)) -#ifdef JP -take_hit(DAMAGE_NOESCAPE, 100+randint1(100), "氷の巻物", -1); -#else - take_hit(DAMAGE_NOESCAPE, 100 + randint1(100), "a Scroll of Ice", -1); -#endif + take_hit(DAMAGE_NOESCAPE, 100+randint1(100), _("氷の巻物", "a Scroll of Ice"), -1); ident = TRUE; break; @@ -2087,11 +1814,7 @@ take_hit(DAMAGE_NOESCAPE, 100+randint1(100), "氷の巻物", -1); { fire_ball(GF_CHAOS, 0, 1000, 4); if (!p_ptr->resist_chaos) -#ifdef JP -take_hit(DAMAGE_NOESCAPE, 111+randint1(111), "ログルスの巻物", -1); -#else - take_hit(DAMAGE_NOESCAPE, 111 + randint1(111), "a Scroll of Logrus", -1); -#endif + take_hit(DAMAGE_NOESCAPE, 111+randint1(111), _("ログルスの巻物", "a Scroll of Logrus"), -1); ident = TRUE; break; @@ -2099,20 +1822,11 @@ take_hit(DAMAGE_NOESCAPE, 111+randint1(111), "ログルスの巻物", -1); case SV_SCROLL_RUMOR: { -#ifdef JP - msg_print("巻物にはメッセージが書かれている:"); -#else - msg_print("There is message on the scroll. It says:"); -#endif - + msg_print(_("巻物にはメッセージが書かれている:", "There is message on the scroll. It says:")); msg_print(NULL); display_rumor(TRUE); msg_print(NULL); -#ifdef JP - msg_print("巻物は煙を立てて消え去った！"); -#else - msg_print("The scroll disappears in a puff of smoke!"); -#endif + msg_print(_("巻物は煙を立てて消え去った！", "The scroll disappears in a puff of smoke!")); ident = TRUE; break; @@ -2135,48 +1849,33 @@ take_hit(DAMAGE_NOESCAPE, 111+randint1(111), "ログルスの巻物", -1); case SV_SCROLL_AMUSEMENT: { ident = TRUE; - amusement(py, px, 1, FALSE); + amusement(p_ptr->y, p_ptr->x, 1, FALSE); break; } case SV_SCROLL_STAR_AMUSEMENT: { ident = TRUE; - amusement(py, px, randint1(2) + 1, FALSE); + amusement(p_ptr->y, p_ptr->x, randint1(2) + 1, FALSE); break; } } } else if (o_ptr->name1 == ART_GHB) { -#ifdef JP - msg_print("私は苦労して『グレーター・ヘル=ビースト』を倒した。"); - msg_print("しかし手に入ったのはこのきたないＴシャツだけだった。"); -#else - msg_print("I had a very hard time to kill the Greater hell-beast, "); - msg_print("but all I got was this lousy t-shirt!"); -#endif + msg_print(_("私は苦労して『グレーター・ヘル=ビースト』を倒した。", "I had a very hard time to kill the Greater hell-beast, ")); + msg_print(_("しかし手に入ったのはこのきたないＴシャツだけだった。", "but all I got was this lousy t-shirt!")); used_up = FALSE; } else if (o_ptr->name1 == ART_POWER) { -#ifdef JP - msg_print("「一つの指輪は全てを統べ、"); + msg_print(_("「一つの指輪は全てを統べ、", "'One Ring to rule them all, ")); msg_print(NULL); - msg_print("一つの指輪は全てを見つけ、"); + msg_print(_("一つの指輪は全てを見つけ、", "One Ring to find them, ")); msg_print(NULL); - msg_print("一つの指輪は全てを捕らえて"); + msg_print(_("一つの指輪は全てを捕らえて", "One Ring to bring them all ")); msg_print(NULL); - msg_print("暗闇の中に繋ぎとめる。」"); -#else - msg_print("'One Ring to rule them all, "); - msg_print(NULL); - msg_print("One Ring to find them, "); - msg_print(NULL); - msg_print("One Ring to bring them all "); - msg_print(NULL); - msg_print("and in the darkness bind them.'"); -#endif + msg_print(_("暗闇の中に繋ぎとめる。」", "and in the darkness bind them.'")); used_up = FALSE; } else if (o_ptr->tval==TV_PARCHMENT) @@ -2277,7 +1976,7 @@ static bool item_tester_hook_readable(object_type *o_ptr) void do_cmd_read_scroll(void) { object_type *o_ptr; - int item; + OBJECT_IDX item; cptr q, s; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) @@ -2288,32 +1987,17 @@ void do_cmd_read_scroll(void) /* Check some conditions */ if (p_ptr->blind) { -#ifdef JP - msg_print("目が見えない。"); -#else - msg_print("You can't see anything."); -#endif - + msg_print(_("目が見えない。", "You can't see anything.")); return; } if (no_lite()) { -#ifdef JP - msg_print("明かりがないので、暗くて読めない。"); -#else - msg_print("You have no light to read by."); -#endif - + msg_print(_("明かりがないので、暗くて読めない。", "You have no light to read by.")); return; } if (p_ptr->confused) { -#ifdef JP - msg_print("混乱していて読めない。"); -#else - msg_print("You are too confused!"); -#endif - + msg_print(_("混乱していて読めない。", "You are too confused!")); return; } @@ -2322,13 +2006,8 @@ void do_cmd_read_scroll(void) item_tester_hook = item_tester_hook_readable; /* Get an item */ -#ifdef JP - q = "どの巻物を読みますか? "; - s = "読める巻物がない。"; -#else - q = "Read which scroll? "; - s = "You have no scrolls to read."; -#endif + q = _("どの巻物を読みますか? ", "Read which scroll? "); + s = _("読める巻物がない。", "You have no scrolls to read."); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return; @@ -2357,7 +2036,7 @@ void do_cmd_read_scroll(void) * @param known 判明済ならばTRUE * @return 発動により効果内容が確定したならばTRUEを返す */ -static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, bool known) +static int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, bool magic, bool known) { int k; int ident = FALSE; @@ -2394,7 +2073,7 @@ static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, b const int times = randint1(powerful ? 8 : 4); for (k = 0; k < times; k++) { - if (summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET))) + if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET))) { ident = TRUE; } @@ -2427,19 +2106,11 @@ static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, b { if (magic) { -#ifdef JP - msg_print("誰かに見守られているような気がする。"); -#else - msg_print("You feel as if someone is watching over you."); -#endif + msg_print(_("誰かに見守られているような気がする。", "You feel as if someone is watching over you.")); } else if (!p_ptr->blind) { -#ifdef JP - msg_print("杖は一瞬ブルーに輝いた..."); -#else - msg_print("The staff glows blue for a moment..."); -#endif + msg_print(_("杖は一瞬ブルーに輝いた...", "The staff glows blue for a moment...")); } ident = TRUE; @@ -2449,18 +2120,13 @@ static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, b case SV_STAFF_STARLITE: { - int num = damroll(5, 3); - int y, x; + HIT_POINT num = damroll(5, 3); + POSITION y = 0, x = 0; int attempts; if (!p_ptr->blind && !magic) { -#ifdef JP - msg_print("杖の先が明るく輝いた..."); -#else - msg_print("The end of the staff glows brightly..."); -#endif - + msg_print(_("杖の先が明るく輝いた...", "The end of the staff glows brightly...")); } for (k = 0; k < num; k++) { @@ -2468,7 +2134,7 @@ static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, b while (attempts--) { - scatter(&y, &x, py, px, 4, 0); + scatter(&y, &x, p_ptr->y, p_ptr->x, 4, 0); if (!cave_have_flag_bold(y, x, FF_PROJECT)) continue; @@ -2574,11 +2240,7 @@ static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, b p_ptr->csp = p_ptr->msp; p_ptr->csp_frac = 0; ident = TRUE; -#ifdef JP - msg_print("頭がハッキリとした。"); -#else - msg_print("You feel your head clear."); -#endif + msg_print(_("頭がハッキリとした。", "You feel your head clear.")); p_ptr->redraw |= (PR_MANA); p_ptr->window |= (PW_PLAYER); @@ -2647,22 +2309,17 @@ static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, b case SV_STAFF_EARTHQUAKES: { - if (earthquake(py, px, (powerful ? 15 : 10))) + if (earthquake(p_ptr->y, p_ptr->x, (powerful ? 15 : 10))) ident = TRUE; else -#ifdef JP -msg_print("ダンジョンが揺れた。"); -#else - msg_print("The dungeon trembles."); -#endif - + msg_print(_("ダンジョンが揺れた。", "The dungeon trembles.")); break; } case SV_STAFF_DESTRUCTION: { - if (destroy_area(py, px, (powerful ? 18 : 13) + randint0(5), FALSE)) + if (destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE)) ident = TRUE; break; @@ -2670,7 +2327,7 @@ msg_print("ダンジョンが揺れた。"); case SV_STAFF_ANIMATE_DEAD: { - if (animate_dead(0, py, px)) + if (animate_dead(0, p_ptr->y, p_ptr->x)) ident = TRUE; break; @@ -2678,20 +2335,12 @@ msg_print("ダンジョンが揺れた。"); case SV_STAFF_MSTORM: { -#ifdef JP - msg_print("強力な魔力が敵を引き裂いた！"); -#else - msg_print("Mighty magics rend your enemies!"); -#endif - project(0, (powerful ? 7 : 5), py, px, + msg_print(_("強力な魔力が敵を引き裂いた！", "Mighty magics rend your enemies!")); + project(0, (powerful ? 7 : 5), p_ptr->y, p_ptr->x, (randint1(200) + (powerful ? 500 : 300)) * 2, GF_MANA, PROJECT_KILL | PROJECT_ITEM | PROJECT_GRID, -1); if ((p_ptr->pclass != CLASS_MAGE) && (p_ptr->pclass != CLASS_HIGH_MAGE) && (p_ptr->pclass != CLASS_SORCERER) && (p_ptr->pclass != CLASS_MAGIC_EATER) && (p_ptr->pclass != CLASS_BLUE_MAGE)) { -#ifdef JP - (void)take_hit(DAMAGE_NOESCAPE, 50, "コントロールし難い強力な魔力の解放", -1); -#else - (void)take_hit(DAMAGE_NOESCAPE, 50, "unleashing magics too mighty to control", -1); -#endif + (void)take_hit(DAMAGE_NOESCAPE, 50, _("コントロールし難い強力な魔力の解放", "unleashing magics too mighty to control"), -1); } ident = TRUE; @@ -2700,18 +2349,10 @@ msg_print("ダンジョンが揺れた。"); case SV_STAFF_NOTHING: { -#ifdef JP - msg_print("何も起らなかった。"); -#else - msg_print("Nothing happen."); -#endif + msg_print(_("何も起らなかった。", "Nothing happen.")); if (prace_is_(RACE_SKELETON) || prace_is_(RACE_GOLEM) || prace_is_(RACE_ZOMBIE) || prace_is_(RACE_SPECTRE)) -#ifdef JP - msg_print("もったいない事をしたような気がする。食べ物は大切にしなくては。"); -#else - msg_print("What a waste. It's your food!"); -#endif + msg_print(_("もったいない事をしたような気がする。食べ物は大切にしなくては。", "What a waste. It's your food!")); break; } } @@ -2753,18 +2394,13 @@ static void do_cmd_use_staff_aux(int item) /* Mega-Hack -- refuse to use a pile from the ground */ if ((item < 0) && (o_ptr->number > 1)) { -#ifdef JP - msg_print("まずは杖を拾わなければ。"); -#else - msg_print("You must first pick up the staffs."); -#endif - + msg_print(_("まずは杖を拾わなければ。", "You must first pick up the staffs.")); return; } /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; /* Extract the item level */ lev = k_info[o_ptr->k_idx].level; @@ -2788,12 +2424,7 @@ static void do_cmd_use_staff_aux(int item) if (world_player) { if (flush_failure) flush(); -#ifdef JP - msg_print("止まった時の中ではうまく働かないようだ。"); -#else - msg_print("Nothing happen. Maybe this staff is freezing too."); -#endif - + msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this staff is freezing too.")); sound(SOUND_FAIL); return; } @@ -2802,12 +2433,7 @@ static void do_cmd_use_staff_aux(int item) if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER)) { if (flush_failure) flush(); -#ifdef JP - msg_print("杖をうまく使えなかった。"); -#else - msg_print("You failed to use the staff properly."); -#endif - + msg_print(_("杖をうまく使えなかった。", "You failed to use the staff properly.")); sound(SOUND_FAIL); return; } @@ -2816,12 +2442,7 @@ static void do_cmd_use_staff_aux(int item) if (o_ptr->pval <= 0) { if (flush_failure) flush(); -#ifdef JP - msg_print("この杖にはもう魔力が残っていない。"); -#else - msg_print("The staff has no charges left."); -#endif - + msg_print(_("この杖にはもう魔力が残っていない。", "The staff has no charges left.")); o_ptr->ident |= (IDENT_EMPTY); /* Combine / Reorder the pack (later) */ @@ -2892,12 +2513,7 @@ static void do_cmd_use_staff_aux(int item) item = inven_carry(q_ptr); /* Message */ -#ifdef JP - msg_print("杖をまとめなおした。"); -#else - msg_print("You unstack your staff."); -#endif - + msg_print(_("杖をまとめなおした。", "You unstack your staff.")); } /* Describe charges in the pack */ @@ -2919,7 +2535,7 @@ static void do_cmd_use_staff_aux(int item) */ void do_cmd_use_staff(void) { - int item; + OBJECT_IDX item; cptr q, s; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) @@ -2931,13 +2547,8 @@ void do_cmd_use_staff(void) item_tester_tval = TV_STAFF; /* Get an item */ -#ifdef JP - q = "どの杖を使いますか? "; - s = "使える杖がない。"; -#else - q = "Use which staff? "; - s = "You have no staff to use."; -#endif + q = _("どの杖を使いますか? ", "Use which staff? "); + s = _("使える杖がない。", "You have no staff to use."); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return; @@ -2952,7 +2563,7 @@ void do_cmd_use_staff(void) * @param magic 魔道具術上の処理ならばTRUE * @return 発動により効果内容が確定したならばTRUEを返す */ -static int wand_effect(int sval, int dir, bool powerful, bool magic) +static int wand_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool powerful, bool magic) { int ident = FALSE; int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev; @@ -2962,7 +2573,7 @@ static int wand_effect(int sval, int dir, bool powerful, bool magic) if (sval == SV_WAND_WONDER) { int vir = virtue_number(V_CHANCE); - sval = randint0(SV_WAND_WONDER); + sval = (OBJECT_SUBTYPE_VALUE)randint0(SV_WAND_WONDER); if (vir) { @@ -2986,7 +2597,7 @@ static int wand_effect(int sval, int dir, bool powerful, bool magic) { case SV_WAND_HEAL_MONSTER: { - int dam = damroll((powerful ? 20 : 10), 10); + HIT_POINT dam = damroll((powerful ? 20 : 10), 10); if (heal_monster(dir, dam)) ident = TRUE; break; } @@ -3026,20 +2637,15 @@ static int wand_effect(int sval, int dir, bool powerful, bool magic) case SV_WAND_STONE_TO_MUD: { - int dam = powerful ? 40 + randint1(60) : 20 + randint1(30); + HIT_POINT dam = powerful ? 40 + randint1(60) : 20 + randint1(30); if (wall_to_mud(dir, dam)) ident = TRUE; break; } case SV_WAND_LITE: { - int dam = damroll((powerful ? 12 : 6), 8); -#ifdef JP - msg_print("青く輝く光線が放たれた。"); -#else - msg_print("A line of blue shimmering light appears."); -#endif - + HIT_POINT dam = damroll((powerful ? 12 : 6), 8); + msg_print(_("青く輝く光線が放たれた。", "A line of blue shimmering light appears.")); (void)lite_line(dir, dam); ident = TRUE; break; @@ -3069,9 +2675,9 @@ static int wand_effect(int sval, int dir, bool powerful, bool magic) break; } - case SV_WAND_DRAIN_LIFE: + case SV_WAND_HYPODYNAMIA: { - if (drain_life(dir, 80 + lev)) ident = TRUE; + if (hypodynamic_bolt(dir, 80 + lev)) ident = TRUE; break; } @@ -3153,32 +2759,27 @@ static int wand_effect(int sval, int dir, bool powerful, bool magic) case SV_WAND_WONDER: { -#ifdef JP - msg_print("おっと、謎の魔法棒を始動させた。"); -#else - msg_print("Oops. Wand of wonder activated."); -#endif - + msg_print(_("おっと、謎の魔法棒を始動させた。", "Oops. Wand of wonder activated.")); break; } case SV_WAND_DRAGON_FIRE: { - fire_ball(GF_FIRE, dir, (powerful ? 300 : 200), -3); + fire_breath(GF_FIRE, dir, (powerful ? 300 : 200), 3); ident = TRUE; break; } case SV_WAND_DRAGON_COLD: { - fire_ball(GF_COLD, dir, (powerful ? 270 : 180), -3); + fire_breath(GF_COLD, dir, (powerful ? 270 : 180), 3); ident = TRUE; break; } case SV_WAND_DRAGON_BREATH: { - int dam; + HIT_POINT dam; int typ; switch (randint1(5)) @@ -3222,12 +2823,7 @@ static int wand_effect(int sval, int dir, bool powerful, bool magic) case SV_WAND_ROCKETS: { -#ifdef JP -msg_print("ロケットを発射した！"); -#else - msg_print("You launch a rocket!"); -#endif - + msg_print(_("ロケットを発射した！", "You launch a rocket!")); fire_rocket(GF_ROCKET, dir, 250 + lev * 3, rad); ident = TRUE; break; @@ -3292,12 +2888,7 @@ static void do_cmd_aim_wand_aux(int item) /* Mega-Hack -- refuse to aim a pile from the ground */ if ((item < 0) && (o_ptr->number > 1)) { -#ifdef JP - msg_print("まずは魔法棒を拾わなければ。"); -#else - msg_print("You must first pick up the wands."); -#endif - + msg_print(_("まずは魔法棒を拾わなければ。", "You must first pick up the wands.")); return; } @@ -3314,7 +2905,7 @@ static void do_cmd_aim_wand_aux(int item) target_pet = old_target_pet; /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; /* Get the level */ lev = k_info[o_ptr->k_idx].level; @@ -3338,12 +2929,7 @@ static void do_cmd_aim_wand_aux(int item) if (world_player) { if (flush_failure) flush(); -#ifdef JP - msg_print("止まった時の中ではうまく働かないようだ。"); -#else - msg_print("Nothing happen. Maybe this wand is freezing too."); -#endif - + msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this wand is freezing too.")); sound(SOUND_FAIL); return; } @@ -3352,12 +2938,7 @@ static void do_cmd_aim_wand_aux(int item) if ((chance < USE_DEVICE) || (randint1(chance) < USE_DEVICE) || (p_ptr->pclass == CLASS_BERSERKER)) { if (flush_failure) flush(); -#ifdef JP - msg_print("魔法棒をうまく使えなかった。"); -#else - msg_print("You failed to use the wand properly."); -#endif - + msg_print(_("魔法棒をうまく使えなかった。", "You failed to use the wand properly.")); sound(SOUND_FAIL); return; } @@ -3366,12 +2947,7 @@ static void do_cmd_aim_wand_aux(int item) if (o_ptr->pval <= 0) { if (flush_failure) flush(); -#ifdef JP - msg_print("この魔法棒にはもう魔力が残っていない。"); -#else - msg_print("The wand has no charges left."); -#endif - + msg_print(_("この魔法棒にはもう魔力が残っていない。", "The wand has no charges left.")); o_ptr->ident |= (IDENT_EMPTY); /* Combine / Reorder the pack (later) */ @@ -3432,7 +3008,7 @@ static void do_cmd_aim_wand_aux(int item) */ void do_cmd_aim_wand(void) { - int item; + OBJECT_IDX item; cptr q, s; /* Restrict choices to wands */ @@ -3444,14 +3020,9 @@ void do_cmd_aim_wand(void) } /* Get an item */ -#ifdef JP - q = "どの魔法棒で狙いますか? "; - s = "使える魔法棒がない。"; -#else - q = "Aim which wand? "; - s = "You have no wand to aim."; -#endif - + q = _("どの魔法棒で狙いますか? ", "Aim which wand? "); + s = _("使える魔法棒がない。", "You have no wand to aim."); + if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return; /* Aim the wand */ @@ -3467,7 +3038,7 @@ void do_cmd_aim_wand(void) * @param magic 魔道具術上の処理ならばTRUE * @return 発動により効果内容が確定したならばTRUEを返す */ -static int rod_effect(int sval, int dir, bool *use_charge, bool powerful, bool magic) +static int rod_effect(OBJECT_SUBTYPE_VALUE sval, int dir, bool *use_charge, bool powerful, bool magic) { int ident = FALSE; int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev; @@ -3599,13 +3170,8 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool powerful, bool m case SV_ROD_LITE: { - int dam = damroll((powerful ? 12 : 6), 8); -#ifdef JP - msg_print("青く輝く光線が放たれた。"); -#else - msg_print("A line of blue shimmering light appears."); -#endif - + HIT_POINT dam = damroll((powerful ? 12 : 6), 8); + msg_print(_("青く輝く光線が放たれた。", "A line of blue shimmering light appears.")); (void)lite_line(dir, dam); ident = TRUE; break; @@ -3623,9 +3189,9 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool powerful, bool m break; } - case SV_ROD_DRAIN_LIFE: + case SV_ROD_HYPODYNAMIA: { - if (drain_life(dir, 70 + 3 * lev / 2)) ident = TRUE; + if (hypodynamic_bolt(dir, 70 + 3 * lev / 2)) ident = TRUE; break; } @@ -3700,7 +3266,7 @@ static int rod_effect(int sval, int dir, bool *use_charge, bool powerful, bool m case SV_ROD_STONE_TO_MUD: { - int dam = powerful ? 40 + randint1(60) : 20 + randint1(30); + HIT_POINT dam = powerful ? 40 + randint1(60) : 20 + randint1(30); if (wall_to_mud(dir, dam)) ident = TRUE; break; } @@ -3756,12 +3322,7 @@ static void do_cmd_zap_rod_aux(int item) /* Mega-Hack -- refuse to zap a pile from the ground */ if ((item < 0) && (o_ptr->number > 1)) { -#ifdef JP - msg_print("まずはロッドを拾わなければ。"); -#else - msg_print("You must first pick up the rods."); -#endif - + msg_print(_("まずはロッドを拾わなければ。", "You must first pick up the rods.")); return; } @@ -3776,7 +3337,7 @@ static void do_cmd_zap_rod_aux(int item) /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; /* Extract the item level */ lev = k_info[o_ptr->k_idx].level; @@ -3796,12 +3357,7 @@ static void do_cmd_zap_rod_aux(int item) if (world_player) { if (flush_failure) flush(); -#ifdef JP - msg_print("止まった時の中ではうまく働かないようだ。"); -#else - msg_print("Nothing happen. Maybe this rod is freezing too."); -#endif - + msg_print(_("止まった時の中ではうまく働かないようだ。", "Nothing happen. Maybe this rod is freezing too.")); sound(SOUND_FAIL); return; } @@ -3822,12 +3378,7 @@ static void do_cmd_zap_rod_aux(int item) if (!success) { if (flush_failure) flush(); -#ifdef JP - msg_print("うまくロッドを使えなかった。"); -#else - msg_print("You failed to use the rod properly."); -#endif - + msg_print(_("うまくロッドを使えなかった。", "You failed to use the rod properly.")); sound(SOUND_FAIL); return; } @@ -3838,24 +3389,14 @@ static void do_cmd_zap_rod_aux(int item) if ((o_ptr->number == 1) && (o_ptr->timeout)) { if (flush_failure) flush(); -#ifdef JP - msg_print("このロッドはまだ魔力を充填している最中だ。"); -#else - msg_print("The rod is still charging."); -#endif - + msg_print(_("このロッドはまだ魔力を充填している最中だ。", "The rod is still charging.")); return; } /* A stack of rods lacks enough energy. */ else if ((o_ptr->number > 1) && (o_ptr->timeout > k_ptr->pval * (o_ptr->number - 1))) { if (flush_failure) flush(); -#ifdef JP -msg_print("そのロッドはまだ充填中です。"); -#else - msg_print("The rods are all still charging."); -#endif - + msg_print(_("そのロッドはまだ充填中です。", "The rods are all still charging.")); return; } @@ -3897,7 +3438,7 @@ msg_print("そのロッドはまだ充填中です。"); */ void do_cmd_zap_rod(void) { - int item; + OBJECT_IDX item; cptr q, s; if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN)) @@ -3909,13 +3450,8 @@ void do_cmd_zap_rod(void) item_tester_tval = TV_ROD; /* Get an item */ -#ifdef JP - q = "どのロッドを振りますか? "; - s = "使えるロッドがない。"; -#else - q = "Zap which rod? "; - s = "You have no rod to zap."; -#endif + q = _("どのロッドを振りますか? ", "Zap which rod? "); + s = _("使えるロッドがない。", "You have no rod to zap."); if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return; @@ -3961,12 +3497,7 @@ void ring_of_power(int dir) case 2: { /* Message */ -#ifdef JP - msg_print("あなたは悪性のオーラに包み込まれた。"); -#else - msg_print("You are surrounded by a malignant aura."); -#endif - + msg_print(_("あなたは悪性のオーラに包み込まれた。", "You are surrounded by a malignant aura.")); sound(SOUND_EVIL); /* Decrease all stats (permanently) */ @@ -3988,12 +3519,7 @@ void ring_of_power(int dir) case 3: { /* Message */ -#ifdef JP - msg_print("あなたは強力なオーラに包み込まれた。"); -#else - msg_print("You are surrounded by a powerful aura."); -#endif - + msg_print(_("あなたは強力なオーラに包み込まれた。", "You are surrounded by a powerful aura.")); /* Dispel monsters */ dispel_monsters(1000); @@ -4097,7 +3623,7 @@ static void do_cmd_activate_aux(int item) } /* Take a turn */ - energy_use = 100; + p_ptr->energy_use = 100; /* Extract the item level */ lev = k_info[o_ptr->k_idx].level; @@ -4128,11 +3654,7 @@ static void do_cmd_activate_aux(int item) if (world_player) { if (flush_failure) flush(); -#ifdef JP - msg_print("止まった時の中ではうまく働かないようだ。"); -#else - msg_print("It shows no reaction."); -#endif + msg_print(_("止まった時の中ではうまく働かないようだ。", "It shows no reaction.")); sound(SOUND_FAIL); return; } @@ -4153,11 +3675,7 @@ static void do_cmd_activate_aux(int item) if (!success) { if (flush_failure) flush(); -#ifdef JP - msg_print("うまく始動させることができなかった。"); -#else - msg_print("You failed to activate it properly."); -#endif + msg_print(_("うまく始動させることができなかった。", "You failed to activate it properly.")); sound(SOUND_FAIL); return; } @@ -4165,11 +3683,7 @@ static void do_cmd_activate_aux(int item) /* Check the recharge */ if (o_ptr->timeout) { -#ifdef JP - msg_print("それは微かに音を立て、輝き、消えた..."); -#else - msg_print("It whines, glows and fades..."); -#endif + msg_print(_("それは微かに音を立て、輝き、消えた...", "It whines, glows and fades...")); return; } @@ -4177,22 +3691,13 @@ static void do_cmd_activate_aux(int item) if (!o_ptr->xtra4 && (o_ptr->tval == TV_FLASK) && ((o_ptr->sval == SV_LITE_TORCH) || (o_ptr->sval == SV_LITE_LANTERN))) { -#ifdef JP - msg_print("燃料がない。"); -#else - msg_print("It has no fuel."); -#endif - energy_use = 0; + msg_print(_("燃料がない。", "It has no fuel.")); + p_ptr->energy_use = 0; return; } /* Activate the artifact */ -#ifdef JP - msg_print("始動させた..."); -#else - msg_print("You activate it..."); -#endif - + msg_print(_("始動させた...", "You activate it...")); /* Sound */ sound(SOUND_ZAP); @@ -4218,23 +3723,19 @@ static void do_cmd_activate_aux(int item) #if 0 if (object_is_cursed(o_ptr)) { -#ifdef JP - msg_print("カン高い音が響き渡った。"); -#else - msg_print("You produce a shrill whistling sound."); -#endif + msg_print(_("カン高い音が響き渡った。", "You produce a shrill whistling sound.")); aggravate_monsters(0); } else #endif { - int pet_ctr, i; - u16b *who; + IDX pet_ctr, i; + IDX *who; int max_pet = 0; u16b dummy_why; /* Allocate the "who" array */ - C_MAKE(who, max_m_idx, u16b); + C_MAKE(who, max_m_idx, IDX); /* Process the monsters (backwards) */ for (pet_ctr = m_max - 1; pet_ctr >= 1; pet_ctr--) @@ -4253,11 +3754,11 @@ static void do_cmd_activate_aux(int item) for (i = 0; i < max_pet; i++) { pet_ctr = who[i]; - teleport_monster_to(pet_ctr, py, px, 100, TELEPORT_PASSIVE); + teleport_monster_to(pet_ctr, p_ptr->y, p_ptr->x, 100, TELEPORT_PASSIVE); } /* Free the "who" array */ - C_KILL(who, max_m_idx, u16b); + C_KILL(who, max_m_idx, IDX); } o_ptr->timeout = 100+randint1(100); return; @@ -4277,10 +3778,10 @@ static void do_cmd_activate_aux(int item) if(fire_ball(GF_CAPTURE, dir, 0, 0)) { - o_ptr->pval = cap_mon; - o_ptr->xtra3 = cap_mspeed; - o_ptr->xtra4 = cap_hp; - o_ptr->xtra5 = cap_maxhp; + o_ptr->pval = (PARAMETER_VALUE)cap_mon; + o_ptr->xtra3 = (XTRA8)cap_mspeed; + o_ptr->xtra4 = (XTRA16)cap_hp; + o_ptr->xtra5 = (XTRA16)cap_maxhp; if (cap_nickname) { cptr t; @@ -4322,11 +3823,11 @@ static void do_cmd_activate_aux(int item) } else { - bool success = FALSE; + success = FALSE; if (!get_rep_dir2(&dir)) return; - if (monster_can_enter(py + ddy[dir], px + ddx[dir], &r_info[o_ptr->pval], 0)) + if (monster_can_enter(p_ptr->y + ddy[dir], p_ptr->x + ddx[dir], &r_info[o_ptr->pval], 0)) { - if (place_monster_aux(0, py + ddy[dir], px + ddx[dir], o_ptr->pval, (PM_FORCE_PET | PM_NO_KAGE))) + if (place_monster_aux(0, p_ptr->y + ddy[dir], p_ptr->x + ddx[dir], o_ptr->pval, (PM_FORCE_PET | PM_NO_KAGE))) { if (o_ptr->xtra3) m_list[hack_m_idx_ii].mspeed = o_ptr->xtra3; if (o_ptr->xtra5) m_list[hack_m_idx_ii].max_maxhp = o_ptr->xtra5; @@ -4394,22 +3895,14 @@ static void do_cmd_activate_aux(int item) } } if (!success) -#ifdef JP - msg_print("おっと、解放に失敗した。"); -#else - msg_print("Oops. You failed to release your pet."); -#endif + msg_print(_("おっと、解放に失敗した。", "Oops. You failed to release your pet.")); } + calc_android_exp(); return; } /* Mistake */ -#ifdef JP - msg_print("おっと、このアイテムは始動できない。"); -#else - msg_print("Oops. That object cannot be activated."); -#endif - + msg_print(_("おっと、このアイテムは始動できない。", "Oops. That object cannot be activated.")); } /*! @@ -4418,7 +3911,7 @@ static void do_cmd_activate_aux(int item) */ void do_cmd_activate(void) { - int item; + OBJECT_IDX item; cptr q, s; @@ -4432,13 +3925,8 @@ void do_cmd_activate(void) item_tester_hook = item_tester_hook_activate; /* Get an item */ -#ifdef JP - q = "どのアイテムを始動させますか? "; - s = "始動できるアイテムを装備していない。"; -#else - q = "Activate which item? "; - s = "You have nothing to activate."; -#endif + q = _("どのアイテムを始動させますか? ", "Activate which item? "); + s = _("始動できるアイテムを装備していない。", "You have nothing to activate."); if (!get_item(&item, q, s, (USE_EQUIP))) return; @@ -4511,7 +3999,7 @@ static bool item_tester_hook_use(object_type *o_ptr) */ void do_cmd_use(void) { - int item; + OBJECT_IDX item; object_type *o_ptr; cptr q, s; @@ -4525,13 +4013,8 @@ void do_cmd_use(void) item_tester_hook = item_tester_hook_use; /* Get an item */ -#ifdef JP -q = "どれを使いますか？"; -s = "使えるものがありません。"; -#else - q = "Use which item? "; - s = "You have nothing to use."; -#endif + q = _("どれを使いますか？", "Use which item? "); + s = _("使えるものがありません。", "You have nothing to use."); if (!get_item(&item, q, s, (USE_INVEN | USE_EQUIP | USE_FLOOR))) return; @@ -4596,32 +4079,17 @@ s = "使えるものがありません。"; /* Check some conditions */ if (p_ptr->blind) { -#ifdef JP -msg_print("目が見えない。"); -#else - msg_print("You can't see anything."); -#endif - + msg_print(_("目が見えない。", "You can't see anything.")); return; } if (no_lite()) { -#ifdef JP -msg_print("明かりがないので、暗くて読めない。"); -#else - msg_print("You have no light to read by."); -#endif - + msg_print(_("明かりがないので、暗くて読めない。", "You have no light to read by.")); return; } if (p_ptr->confused) { -#ifdef JP -msg_print("混乱していて読めない！"); -#else - msg_print("You are too confused!"); -#endif - + msg_print(_("混乱していて読めない！", "You are too confused!")); return; } @@ -4652,19 +4120,20 @@ msg_print("混乱していて読めない！"); * @param only_browse 閲覧するだけならばTRUE * @return 選択した魔力のID、キャンセルならば-1を返す */ -static int select_magic_eater(bool only_browse) +static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse) { - int ext=0; + OBJECT_SUBTYPE_VALUE ext = 0; char choice; bool flag, request_list; - int tval = 0; - int ask = TRUE, i = 0; + OBJECT_TYPE_VALUE tval = 0; + int ask = TRUE; + OBJECT_SUBTYPE_VALUE i = 0; char out_val[160]; int menu_line = (use_menu ? 1 : 0); #ifdef ALLOW_REPEAT - int sn; + COMMAND_CODE sn; if (repeat_pull(&sn)) { /* Verify the spell */ @@ -4682,11 +4151,7 @@ static int select_magic_eater(bool only_browse) } if (i == 108) { -#ifdef JP - msg_print("魔法を覚えていない！"); -#else - msg_print("You don't have any magic!"); -#endif + msg_print(_("魔法を覚えていない！", "You don't have any magic!")); return -1; } @@ -4744,11 +4209,7 @@ static int select_magic_eater(bool only_browse) { while (TRUE) { -#ifdef JP - if (!get_com("[A] 杖, [B] 魔法棒, [C] ロッド:", &choice, TRUE)) -#else - if (!get_com("[A] staff, [B] wand, [C] rod:", &choice, TRUE)) -#endif + if (!get_com(_("[A] 杖, [B] 魔法棒, [C] ロッド:", "[A] staff, [B] wand, [C] rod:"), &choice, TRUE)) { return -1; } @@ -4782,11 +4243,7 @@ static int select_magic_eater(bool only_browse) } if (i == ext+EATER_EXT) { -#ifdef JP - msg_print("その種類の魔法は覚えていない！"); -#else - msg_print("You don't have that type of magic!"); -#endif + msg_print(_("その種類の魔法は覚えていない！", "You don't have that type of magic!")); return -1; } @@ -4811,10 +4268,12 @@ static int select_magic_eater(bool only_browse) if (request_list || use_menu) { byte y, x = 0; - int ctr, chance; - int k_idx; + OBJECT_SUBTYPE_VALUE ctr; + PERCENTAGE chance; + IDX k_idx; char dummy[80]; - int x1, y1, level; + POSITION x1, y1; + int level; byte col; strcpy(dummy, ""); @@ -4841,13 +4300,9 @@ static int select_magic_eater(bool only_browse) if (use_menu) { if (ctr == (menu_line-1)) -#ifdef JP - strcpy(dummy, "》"); -#else - strcpy(dummy, "> "); -#endif - else strcpy(dummy, " "); - + strcpy(dummy, _("》", "> ")); + else + strcpy(dummy, " "); } /* letter/number for power selection */ else @@ -4886,11 +4341,7 @@ static int select_magic_eater(bool only_browse) if (tval == TV_ROD) { strcat(dummy, format( -#ifdef JP - " %-22.22s 充填:%2d/%2d%3d%%", -#else - " %-22.22s (%2d/%2d) %3d%%", -#endif + _(" %-22.22s 充填:%2d/%2d%3d%%", " %-22.22s (%2d/%2d) %3d%%"), k_name + k_info[k_idx].name, p_ptr->magic_num1[ctr+ext] ? (p_ptr->magic_num1[ctr+ext] - 1) / (EATER_ROD_CHARGE * k_info[k_idx].pval) +1 : 0, @@ -5018,7 +4469,7 @@ static int select_magic_eater(bool only_browse) ask = (isupper(choice)); /* Lowercase */ - if (ask) choice = tolower(choice); + if (ask) choice = (char)tolower(choice); /* Extract request */ i = (islower(choice) ? A2I(choice) : -1); @@ -5046,11 +4497,7 @@ static int select_magic_eater(bool only_browse) char tmp_val[160]; /* Prompt */ -#ifdef JP - (void) strnfmt(tmp_val, 78, "%sを使いますか？ ", k_name + k_info[lookup_kind(tval ,i)].name); -#else - (void) strnfmt(tmp_val, 78, "Use %s?", k_name + k_info[lookup_kind(tval ,i)].name); -#endif + (void) strnfmt(tmp_val, 78, _("%sを使いますか？ ", "Use %s?"), k_name + k_info[lookup_kind(tval ,i)].name); /* Belay that order */ if (!get_check(tmp_val)) continue; @@ -5059,11 +4506,7 @@ static int select_magic_eater(bool only_browse) { if (p_ptr->magic_num1[ext+i] > k_info[lookup_kind(tval, i)].pval * (p_ptr->magic_num2[ext+i] - 1) * EATER_ROD_CHARGE) { -#ifdef JP - msg_print("その魔法はまだ充填している最中だ。"); -#else - msg_print("The magic are still charging."); -#endif + msg_print(_("その魔法はまだ充填している最中だ。", "The magic are still charging.")); msg_print(NULL); if (use_menu) ask = TRUE; continue; @@ -5073,11 +4516,7 @@ static int select_magic_eater(bool only_browse) { if (p_ptr->magic_num1[ext+i] < EATER_CHARGE) { -#ifdef JP - msg_print("その魔法は使用回数が切れている。"); -#else - msg_print("The magic has no charges left."); -#endif + msg_print(_("その魔法は使用回数が切れている。", "The magic has no charges left.")); msg_print(NULL); if (use_menu) ask = TRUE; continue; @@ -5132,30 +4571,30 @@ static int select_magic_eater(bool only_browse) */ bool do_cmd_magic_eater(bool only_browse, bool powerful) { - int item, chance, level, k_idx, tval, sval; + OBJECT_SUBTYPE_VALUE item; + PERCENTAGE chance; + DEPTH level; + IDX k_idx; + OBJECT_TYPE_VALUE tval; + OBJECT_SUBTYPE_VALUE sval; bool use_charge = TRUE; /* Not when confused */ if (!only_browse && p_ptr->confused) { -#ifdef JP -msg_print("混乱していて唱えられない！"); -#else - msg_print("You are too confused!"); -#endif - + msg_print(_("混乱していて唱えられない！", "You are too confused!")); return FALSE; } item = select_magic_eater(only_browse); if (item == -1) { - energy_use = 0; + p_ptr->energy_use = 0; return FALSE; } if (item >= EATER_EXT*2) {tval = TV_ROD;sval = item - EATER_EXT*2;} else if (item >= EATER_EXT) {tval = TV_WAND;sval = item - EATER_EXT;} - else {tval = TV_STAFF;sval = item;} + else {tval = TV_STAFF; sval = item;} k_idx = lookup_kind(tval, sval); level = (tval == TV_ROD ? k_info[k_idx].level * 5 / 6 - 5 : k_info[k_idx].level); @@ -5179,17 +4618,12 @@ msg_print("混乱していて唱えられない！"); if (randint0(100) < chance) { if (flush_failure) flush(); - -#ifdef JP -msg_print("呪文をうまく唱えられなかった！"); -#else - msg_format("You failed to get the magic off!"); -#endif - + + msg_print(_("呪文をうまく唱えられなかった！", "You failed to get the magic off!")); sound(SOUND_FAIL); if (randint1(100) >= chance) chg_virtue(V_CHANCE,-1); - energy_use = 100; + p_ptr->energy_use = 100; return TRUE; } @@ -5217,7 +4651,7 @@ msg_print("呪文をうまく唱えられなかった！"); if (randint1(100) < chance) chg_virtue(V_CHANCE,1); } - energy_use = 100; + p_ptr->energy_use = 100; if (tval == TV_ROD) p_ptr->magic_num1[item] += k_info[k_idx].pval * EATER_ROD_CHARGE; else p_ptr->magic_num1[item] -= EATER_CHARGE;