From 9194abf87f10509314cbe620b909e3445c27f099 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 17 Nov 2018 18:14:57 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=A1?= =?utf8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86=20/=20Refactor=20comments.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick.c | 3 --- src/bldg.c | 1 - src/cmd-activate.c | 1 - src/cmd-eat.c | 1 - src/cmd-item.c | 8 -------- src/cmd-pet.c | 3 --- src/cmd-usestaff.c | 1 - src/cmd1.c | 7 ------- src/cmd2.c | 36 ------------------------------------ src/cmd4.c | 10 ---------- src/cmd5.c | 3 --- src/dungeon.c | 7 ------- src/effects.c | 7 ------- src/files.c | 5 ----- src/floor-generate.c | 5 ----- src/init2.c | 2 -- src/melee1.c | 17 ----------------- src/mind.c | 2 -- src/monster-process.c | 3 --- src/mspells1.c | 1 - src/mspells2.c | 1 - src/mspells3.c | 2 -- src/mspells4.c | 5 ----- src/object1.c | 5 ----- src/object2.c | 9 --------- src/racial.c | 1 - src/rooms-pitnest.c | 1 - src/rooms-vault.c | 2 -- src/save.c | 4 ---- src/spells1.c | 21 --------------------- src/spells2.c | 4 ---- src/spells3.c | 11 ----------- src/store.c | 12 ------------ src/wizard1.c | 4 ---- src/wizard2.c | 2 -- src/xtra1.c | 11 ----------- src/xtra2.c | 2 -- src/z-virt.c | 1 - 38 files changed, 221 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 71ddabf76..6d5b823f2 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -1587,7 +1587,6 @@ static void auto_destroy_item(object_type *o_ptr, int autopick_idx) /* Describe the object (with {terrible/special}) */ object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name); /* Done */ @@ -1733,7 +1732,6 @@ void autopick_pickup_items(cave_type *c_ptr) /* Describe the object */ object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name); /* Hack - remember that the item has given a message here. */ o_ptr->marked |= OM_NOMSG; @@ -1936,7 +1934,6 @@ bool autopick_autoregister(object_type *o_ptr) /* Describe the object (with {terrible/special}) */ object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name); /* Done */ diff --git a/src/bldg.c b/src/bldg.c index 1e4b03f17..d73adb046 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -3469,7 +3469,6 @@ static bool enchant_item(PRICE cost, HIT_PROB to_hit, HIT_POINT to_dam, ARMOUR_C /* Flush */ if (flush_failure) flush(); - /* Message */ msg_print(_("改良に失敗した。", "The improvement failed.")); return (FALSE); diff --git a/src/cmd-activate.c b/src/cmd-activate.c index 60e464326..c9b80303b 100644 --- a/src/cmd-activate.c +++ b/src/cmd-activate.c @@ -1485,7 +1485,6 @@ bool activate_artifact(object_type *o_ptr) p_ptr->csp = 0; p_ptr->csp_frac = 0; - /* Message */ msg_print(_("石を制御できない！", "You are too weak to control the stone!")); /* Hack -- Bypass free action */ (void)set_paralyzed(p_ptr->paralyzed + diff --git a/src/cmd-eat.c b/src/cmd-eat.c index 7c7532e84..8a9a0bf2b 100644 --- a/src/cmd-eat.c +++ b/src/cmd-eat.c @@ -393,7 +393,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item) p_ptr->total_weight -= q_ptr->weight; item = inven_carry(q_ptr); - /* Message */ msg_format(_("杖をまとめなおした。", "You unstack your staff.")); } diff --git a/src/cmd-item.c b/src/cmd-item.c index d1c383771..f63653239 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -328,7 +328,6 @@ void do_cmd_wield(void) /* Describe it */ object_desc(o_name, &inventory[slot], (OD_OMIT_PREFIX | OD_NAME_ONLY)); - /* Message */ #ifdef JP msg_format("%s%sは呪われているようだ。", describe_use(slot) , o_name ); @@ -492,7 +491,6 @@ void do_cmd_wield(void) /* Describe the result */ object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(act, o_name, index_to_label(slot)); @@ -904,7 +902,6 @@ void do_cmd_destroy(void) { p_ptr->energy_use = 0; - /* Message */ msg_format(_("%sは破壊不可能だ。", "You cannot destroy %s."), o_name); /* Done */ return; @@ -912,7 +909,6 @@ void do_cmd_destroy(void) object_copy(q_ptr, o_ptr); - /* Message */ msg_format(_("%sを壊した。", "You destroy %s."), o_name); sound(SOUND_DESTITEM); @@ -1085,7 +1081,6 @@ void do_cmd_uninscribe(void) return; } - /* Message */ msg_print(_("銘を消した。", "Inscription removed.")); /* Remove the incription */ @@ -1138,7 +1133,6 @@ void do_cmd_inscribe(void) /* Describe the activity */ object_desc(o_name, o_ptr, OD_OMIT_INSCRIPTION); - /* Message */ msg_format(_("%sに銘を刻む。", "Inscribing %s."), o_name); msg_print(NULL); @@ -1242,7 +1236,6 @@ static void do_cmd_refill_lamp(void) /* Refuel */ j_ptr->xtra4 += o_ptr->xtra4; - /* Message */ msg_print(_("ランプに油を注いだ。", "You fuel your lamp.")); /* Comment */ @@ -1351,7 +1344,6 @@ static void do_cmd_refill_torch(void) /* Refuel */ j_ptr->xtra4 += o_ptr->xtra4 + 5; - /* Message */ msg_print(_("松明を結合した。", "You combine the torches.")); /* Comment */ diff --git a/src/cmd-pet.c b/src/cmd-pet.c index 957867017..c3616bf4d 100644 --- a/src/cmd-pet.c +++ b/src/cmd-pet.c @@ -331,7 +331,6 @@ bool do_riding(bool force) { p_ptr->energy_use = 100; - /* Message */ msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); py_attack(y, x, 0); @@ -456,7 +455,6 @@ static void do_name_pet(void) if (!is_pet(m_ptr)) { - /* Message */ msg_print(_("そのモンスターはペットではない。", "This monster is not a pet.")); return; } @@ -467,7 +465,6 @@ static void do_name_pet(void) } monster_desc(m_name, m_ptr, 0); - /* Message */ msg_format(_("%sに名前をつける。", "Name %s."), m_name); msg_print(NULL); diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c index 1fbf339b6..82e633099 100644 --- a/src/cmd-usestaff.c +++ b/src/cmd-usestaff.c @@ -451,7 +451,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item) p_ptr->total_weight -= q_ptr->weight; item = inven_carry(q_ptr); - /* Message */ msg_print(_("杖をまとめなおした。", "You unstack your staff.")); } diff --git a/src/cmd1.c b/src/cmd1.c index 351df555e..fbe1dd165 100644 --- a/src/cmd1.c +++ b/src/cmd1.c @@ -368,7 +368,6 @@ static void discover_hidden_things(POSITION y, POSITION x) /* Pick a trap */ disclose_grid(y, x); - /* Message */ msg_print(_("トラップを発見した。", "You have found a trap.")); /* Disturb */ @@ -378,7 +377,6 @@ static void discover_hidden_things(POSITION y, POSITION x) /* Secret door */ if (is_hidden_door(c_ptr)) { - /* Message */ msg_print(_("隠しドアを発見した。", "You have found a secret door.")); /* Disclose */ @@ -408,7 +406,6 @@ static void discover_hidden_things(POSITION y, POSITION x) /* Identify once */ if (!object_is_known(o_ptr)) { - /* Message */ msg_print(_("箱に仕掛けられたトラップを発見した！", "You have discovered a trap on the chest!")); /* Know the trap */ @@ -508,7 +505,6 @@ void py_pickup_aux(OBJECT_IDX o_idx) /* Describe the object */ object_desc(o_name, o_ptr, 0); - /* Message */ #ifdef JP if ((o_ptr->name1 == ART_CRIMSON) && (p_ptr->pseikaku == SEIKAKU_COMBAT)) { @@ -626,7 +622,6 @@ void carry(bool pickup) /* Delete the gold */ delete_object_idx(this_o_idx); - /* Message */ msg_format(_(" $%ld の価値がある%sを見つけた。", "You collect %ld gold pieces worth of %s."), (long)value, o_name); @@ -1032,7 +1027,6 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode) /* Hidden trap */ if (c_ptr->mimic || have_flag(f_ptr->flags, FF_SECRET)) { - /* Message */ msg_print(_("トラップだ！", "You found a trap!")); /* Pick a trap */ @@ -2147,7 +2141,6 @@ void run_step(DIRECTION dir) { sound(SOUND_HITWALL); - /* Message */ msg_print(_("その方向には走れません。", "You cannot run in that direction.")); /* Disturb */ diff --git a/src/cmd2.c b/src/cmd2.c index bc55c0242..7b063162b 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -704,7 +704,6 @@ static bool do_cmd_open_aux(POSITION y, POSITION x) /* Success */ if (randint0(100) < j) { - /* Message */ msg_print(_("鍵をはずした。", "You have picked the lock.")); /* Open the door */ @@ -722,7 +721,6 @@ static bool do_cmd_open_aux(POSITION y, POSITION x) /* Failure */ if (flush_failure) flush(); - /* Message */ msg_print(_("鍵をはずせなかった。", "You failed to pick the lock.")); /* We may keep trying */ @@ -822,7 +820,6 @@ void do_cmd_open(void) /* Nothing useful */ if (!have_flag(f_info[feat].flags, FF_OPEN) && !o_idx) { - /* Message */ msg_print(_("そこには開けるものが見当たらない。", "You see nothing there to open.")); } @@ -831,7 +828,6 @@ void do_cmd_open(void) { p_ptr->energy_use = 100; - /* Message */ msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); /* Attack */ @@ -890,7 +886,6 @@ static bool do_cmd_close_aux(POSITION y, POSITION x) if ((c_ptr->o_idx || (c_ptr->info & CAVE_OBJECT)) && (closed_feat != old_feat) && !have_flag(f_info[closed_feat].flags, FF_DROP)) { - /* Message */ msg_print(_("何かがつっかえて閉まらない。", "There seems stuck.")); } else @@ -901,7 +896,6 @@ static bool do_cmd_close_aux(POSITION y, POSITION x) /* Broken door */ if (old_feat == c_ptr->feat) { - /* Message */ msg_print(_("ドアは壊れてしまっている。", "The door appears to be broken.")); } else @@ -981,7 +975,6 @@ void do_cmd_close(void) /* Require open/broken door */ if (!have_flag(f_info[feat].flags, FF_CLOSE)) { - /* Message */ msg_print(_("そこには閉じるものが見当たらない。", "You see nothing there to close.")); } @@ -990,7 +983,6 @@ void do_cmd_close(void) { p_ptr->energy_use = 100; - /* Message */ msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); /* Attack */ @@ -1024,7 +1016,6 @@ static bool do_cmd_tunnel_test(POSITION y, POSITION x) /* Must have knowledge */ if (!(c_ptr->info & CAVE_MARK)) { - /* Message */ msg_print(_("そこには何も見当たらない。", "You see nothing there.")); /* Nope */ @@ -1034,7 +1025,6 @@ static bool do_cmd_tunnel_test(POSITION y, POSITION x) /* Must be a wall/door/etc */ if (!cave_have_flag_grid(c_ptr, FF_TUNNEL)) { - /* Message */ msg_print(_("そこには掘るものが見当たらない。", "You see nothing there to tunnel.")); /* Nope */ @@ -1103,7 +1093,6 @@ static bool do_cmd_tunnel_aux(POSITION y, POSITION x) /* Dig */ if (p_ptr->skill_dig > randint0(20 * power)) { - /* Message */ msg_format(_("%sをくずした。", "You have removed the %s."), name); /* Remove the feature */ @@ -1232,7 +1221,6 @@ void do_cmd_tunnel(void) /* No tunnelling through doors */ if (have_flag(f_info[feat].flags, FF_DOOR)) { - /* Message */ msg_print(_("ドアは掘れない。", "You cannot tunnel through doors.")); } @@ -1247,7 +1235,6 @@ void do_cmd_tunnel(void) { p_ptr->energy_use = 100; - /* Message */ msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); /* Attack */ @@ -1327,7 +1314,6 @@ bool easy_open_door(POSITION y, POSITION x) /* Success */ if (randint0(100) < j) { - /* Message */ msg_print(_("鍵をはずした。", "You have picked the lock.")); /* Open the door */ @@ -1345,7 +1331,6 @@ bool easy_open_door(POSITION y, POSITION x) /* Failure */ if (flush_failure) flush(); - /* Message */ msg_print(_("鍵をはずせなかった。", "You failed to pick the lock.")); } @@ -1507,7 +1492,6 @@ static bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir) /* Success */ if (randint0(100) < j) { - /* Message */ msg_format(_("%sを解除した。", "You have disarmed the %s."), name); /* Reward */ @@ -1535,7 +1519,6 @@ static bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir) /* Failure */ if (flush_failure) flush(); - /* Message */ msg_format(_("%sの解除に失敗した。", "You failed to disarm the %s."), name); /* We may keep trying */ @@ -1545,7 +1528,6 @@ static bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir) /* Failure -- Set off the trap */ else { - /* Message */ msg_format(_("%sを作動させてしまった！", "You set off the %s!"), name); #ifdef ALLOW_EASY_DISARM /* TNB */ @@ -1642,14 +1624,12 @@ void do_cmd_disarm(void) /* Disarm a trap */ if (!is_trap(feat) && !o_idx) { - /* Message */ msg_print(_("そこには解除するものが見当たらない。", "You see nothing there to disarm.")); } /* Monster in the way */ else if (c_ptr->m_idx && p_ptr->riding != c_ptr->m_idx) { - /* Message */ msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); /* Attack */ @@ -1711,7 +1691,6 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir) p_ptr->energy_use = 100; - /* Message */ msg_format(_("%sに体当たりをした！", "You smash into the %s!"), name); /* Compare bash power to door power XXX XXX XXX */ @@ -1725,7 +1704,6 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir) /* Hack -- attempt to bash down the door */ if (randint0(100) < temp) { - /* Message */ msg_format(_("%sを壊した！", "The %s crashes open!"), name); sound(have_flag(f_ptr->flags, FF_GLASS) ? SOUND_GLASS : SOUND_OPENDOOR); @@ -1750,7 +1728,6 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir) else if (randint0(100) < adj_dex_safe[p_ptr->stat_ind[A_DEX]] + p_ptr->lev) { - /* Message */ msg_format(_("この%sは頑丈だ。", "The %s holds firm."), name); /* Allow repeated bashing */ @@ -1760,7 +1737,6 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir) /* High dexterity yields coolness */ else { - /* Message */ msg_print(_("体のバランスをくずしてしまった。", "You are off-balance.")); /* Hack -- Lose balance ala paralysis */ @@ -1835,7 +1811,6 @@ void do_cmd_bash(void) /* Nothing useful */ if (!have_flag(f_info[feat].flags, FF_BASH)) { - /* Message */ msg_print(_("そこには体当たりするものが見当たらない。", "You see nothing there to bash.")); } @@ -1844,7 +1819,6 @@ void do_cmd_bash(void) { p_ptr->energy_use = 100; - /* Message */ msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); /* Attack */ @@ -2053,14 +2027,12 @@ void do_cmd_spike(void) /* Require closed door */ if (!have_flag(f_info[feat].flags, FF_SPIKE)) { - /* Message */ msg_print(_("そこにはくさびを打てるものが見当たらない。", "You see nothing there to spike.")); } /* Get a spike */ else if (!get_spike(&item)) { - /* Message */ msg_print(_("くさびを持っていない！", "You have no spikes!")); } @@ -2069,7 +2041,6 @@ void do_cmd_spike(void) { p_ptr->energy_use = 100; - /* Message */ msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!")); /* Attack */ @@ -3141,7 +3112,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr) /* Get "the monster" or "it" */ monster_desc(m_name, m_ptr, 0); - /* Message */ msg_format(_("%sが%sに命中した。", "The %s hits %s."), o_name, m_name); if (m_ptr->ml) @@ -3229,7 +3199,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr) msg_format(_("%sは%sに突き刺さった！", "%^s have stuck into %s!"),o_name, m_name); } - /* Message */ message_pain(c_mon_ptr->m_idx, tdam); /* Anger the monster */ @@ -3245,7 +3214,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr) /* Get the monster name (or "it") */ monster_desc(m_name, m_ptr, 0); - /* Message */ msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name); } @@ -3758,7 +3726,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken) /* Get "the monster" or "it" */ monster_desc(m_name, m_ptr, 0); - /* Message */ msg_format(_("%sが%sに命中した。", "The %s hits %s."), o_name, m_name); if (m_ptr->ml) @@ -3821,7 +3788,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken) /* No death */ else { - /* Message */ message_pain(c_ptr->m_idx, tdam); /* Anger the monster */ @@ -3838,7 +3804,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken) /* Get the monster name (or "it") */ monster_desc(m_name, m_ptr, 0); - /* Message */ msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name); } } @@ -3874,7 +3839,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken) { if (hit_body || hit_wall || (randint1(100) < j)) { - /* Message */ msg_format(_("%sは砕け散った！", "The %s shatters!"), o_name); if (potion_smash_effect(0, y, x, q_ptr->k_idx)) diff --git a/src/cmd4.c b/src/cmd4.c index d00abf2ab..83a6c8f4c 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -3184,7 +3184,6 @@ void do_cmd_visuals(void) /* Close */ close_auto_dump(); - /* Message */ msg_print(_("モンスターの[色/文字]をファイルに書き出しました。", "Dumped monster attr/chars.")); break; @@ -3253,7 +3252,6 @@ void do_cmd_visuals(void) /* Close */ close_auto_dump(); - /* Message */ msg_print(_("アイテムの[色/文字]をファイルに書き出しました。", "Dumped object attr/chars.")); break; @@ -3309,7 +3307,6 @@ void do_cmd_visuals(void) /* Close */ close_auto_dump(); - /* Message */ msg_print(_("地形の[色/文字]をファイルに書き出しました。", "Dumped feature attr/chars.")); break; @@ -3639,7 +3636,6 @@ void do_cmd_visuals(void) /* Reset */ reset_visuals(); - /* Message */ msg_print(_("画面上の[色/文字]を初期値にリセットしました。", "Visual attr/char tables reset.")); need_redraw = TRUE; break; @@ -3786,7 +3782,6 @@ void do_cmd_colors(void) /* Close */ close_auto_dump(); - /* Message */ msg_print(_("カラーの設定をファイルに書き出しました。", "Dumped color redefinitions.")); } @@ -4763,7 +4758,6 @@ void do_cmd_load_screen(void) my_fclose(fff); - /* Message */ prt(_("ファイルに書き出された画面(記念撮影)をロードしました。", "Screen dump loaded."), 0, 0); flush(); @@ -5101,7 +5095,6 @@ void do_cmd_save_screen_html_aux(char *filename, int message) /* Close it */ my_fclose(fff); - /* Message */ if (message) { msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved.")); msg_print(NULL); @@ -5275,7 +5268,6 @@ void do_cmd_save_screen(void) /* Close it */ my_fclose(fff); - /* Message */ msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved.")); msg_print(NULL); @@ -8717,7 +8709,6 @@ void do_cmd_time(void) if (day < MAX_DAYS) sprintf(day_buf, "%d", day); else strcpy(day_buf, "*****"); - /* Message */ #ifdef JP msg_format("%s日目, 時刻は%d:%02d %sです。", day_buf, (hour % 12 == 0) ? 12 : (hour % 12), @@ -8793,7 +8784,6 @@ void do_cmd_time(void) } } - /* Message */ msg_print(desc); /* Close the file */ diff --git a/src/cmd5.c b/src/cmd5.c index a74cef57a..7f131e899 100644 --- a/src/cmd5.c +++ b/src/cmd5.c @@ -783,7 +783,6 @@ void do_cmd_study(void) /* Nothing to study */ if (spell < 0) { - /* Message */ msg_format(_("その本には学ぶべき%sがない。", "You cannot learn any %ss in that book."), p); /* Abort */ @@ -1329,7 +1328,6 @@ void do_cmd_cast(void) p_ptr->csp = 0; p_ptr->csp_frac = 0; - /* Message */ msg_print(_("精神を集中しすぎて気を失ってしまった！", "You faint from the effort!")); /* Hack -- Bypass free action */ @@ -1365,7 +1363,6 @@ void do_cmd_cast(void) { bool perm = (randint0(100) < 25); - /* Message */ msg_print(_("体を悪くしてしまった！", "You have damaged your health!")); /* Reduce constitution */ diff --git a/src/dungeon.c b/src/dungeon.c index 16abf6323..a6fea44f3 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -1374,7 +1374,6 @@ static void process_world_aux_digestion(void) /* Faint occasionally */ if (!p_ptr->paralyzed && (randint0(100) < 10)) { - /* Message */ msg_print(_("あまりにも空腹で気絶してしまった。", "You faint from the lack of food.")); disturb(1, 1); @@ -3385,7 +3384,6 @@ static void process_world(void) /* Count warnings */ closing_flag++; - /* Message */ msg_print(_("アングバンドへの門が閉じかかっています...", "The gates to ANGBAND are closing...")); msg_print(_("ゲームを終了するかセーブするかして下さい。", "Please finish up and/or save your game.")); @@ -3394,7 +3392,6 @@ static void process_world(void) /* Slam the gate */ else { - /* Message */ msg_print(_("今、アングバンドへの門が閉ざされました。", "The gates to ANGBAND are now closed.")); /* Stop playing */ @@ -3473,7 +3470,6 @@ static void process_world(void) /* Verify store type */ if (f_ptr->subtype == n) { - /* Message */ if (cheat_xtra) msg_format(_("%sの店主をシャッフルします。", "Shuffle a Shopkeeper of %s."), f_name + f_ptr->name); /* Shuffle it */ @@ -4677,7 +4673,6 @@ static void pack_overflow(void) /* Describe */ object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(_("%s(%c)を落とした。", "You drop %s (%c)."), o_name, index_to_label(INVEN_PACK)); /* Drop it (carefully) near the player */ @@ -6285,7 +6280,6 @@ void play_game(bool new_game) /* Mark savefile */ p_ptr->noscore |= 0x0001; - /* Message */ msg_print(_("ウィザードモードに念を送り、死を欺いた。", "You invoke wizard mode and cheat death.")); msg_print(NULL); @@ -6311,7 +6305,6 @@ void play_game(bool new_game) /* Hack -- cancel recall */ if (p_ptr->word_recall) { - /* Message */ msg_print(_("張りつめた大気が流れ去った...", "A tension leaves the air around you...")); msg_print(NULL); diff --git a/src/effects.c b/src/effects.c index 5d41b9e15..1b2822192 100644 --- a/src/effects.c +++ b/src/effects.c @@ -3986,7 +3986,6 @@ bool do_dec_stat(int stat) /* Sustain */ if (sust && (!ironman_nightmare || randint0(13))) { - /* Message */ msg_format(_("%sなった気がしたが、すぐに元に戻った。", "You feel %s for a moment, but the feeling passes."), desc_stat_neg[stat]); @@ -3997,7 +3996,6 @@ bool do_dec_stat(int stat) /* Attempt to reduce the stat */ if (dec_stat(stat, 10, (ironman_nightmare && !randint0(13)))) { - /* Message */ msg_format(_("ひどく%sなった気がする。", "You feel very %s."), desc_stat_neg[stat]); /* Notice effect */ @@ -4017,7 +4015,6 @@ bool do_res_stat(int stat) /* Attempt to increase */ if (res_stat(stat)) { - /* Message */ msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]); /* Notice */ @@ -4055,7 +4052,6 @@ bool do_inc_stat(int stat) else if (stat == A_CON) chg_virtue(V_VITALITY, 1); - /* Message */ msg_format(_("ワーオ！とても%sなった！", "Wow! You feel very %s!"), desc_stat_pos[stat]); /* Notice */ @@ -4065,7 +4061,6 @@ bool do_inc_stat(int stat) /* Restoration worked */ if (res) { - /* Message */ msg_format(_("元通りに%sなった気がする。", "You feel less %s."), desc_stat_pos[stat]); /* Notice */ @@ -4085,7 +4080,6 @@ bool restore_level(void) /* Restore experience */ if (p_ptr->exp < p_ptr->max_exp) { - /* Message */ msg_print(_("経験値が戻ってきた気がする。", "You feel your experience returning.")); /* Restore the experience */ @@ -4721,7 +4715,6 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell) now_damaged = TRUE; } - /* Message */ msg_print(_("*** 警告:低ヒット・ポイント！ ***", "*** LOW HITPOINT WARNING! ***")); msg_print(NULL); flush(); diff --git a/src/files.c b/src/files.c index 337607784..10ee2e728 100644 --- a/src/files.c +++ b/src/files.c @@ -5060,7 +5060,6 @@ errr file_character(cptr name) /* Invalid file */ if (!fff) { - /* Message */ prt(_("キャラクタ情報のファイルへの書き出しに失敗しました！", "Character dump failed!"), 0, 0); (void)inkey(); @@ -5075,7 +5074,6 @@ errr file_character(cptr name) my_fclose(fff); - /* Message */ msg_print(_("キャラクタ情報のファイルへの書き出しに成功しました。", "Character dump successful.")); msg_print(NULL); @@ -5377,7 +5375,6 @@ bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode /* Oops */ if (!fff) { - /* Message */ msg_format(_("'%s'をオープンできません。", "Cannot open '%s'."), name); msg_print(NULL); @@ -6128,7 +6125,6 @@ void do_cmd_save_game(int is_autosave) /* Handle stuff */ handle_stuff(); - /* Message */ prt(_("ゲームをセーブしています...", "Saving game..."), 0, 0); /* Refresh */ @@ -7482,7 +7478,6 @@ static void handle_signal_abort(int sig) _("恐ろしいソフトのバグが飛びかかってきた！", "A gruesome software bug LEAPS out at you!")); - /* Message */ Term_putstr(45, hgt - 1, -1, TERM_RED, _("緊急セーブ...", "Panic save...")); do_cmd_write_nikki(NIKKI_GAMESTART, 0, _("----ゲーム異常終了----", "---- Panic Save and Abort Game ----")); diff --git a/src/floor-generate.c b/src/floor-generate.c index 9f2ba7376..b140aa7c4 100644 --- a/src/floor-generate.c +++ b/src/floor-generate.c @@ -1465,7 +1465,6 @@ void generate_cave(void) /* Prevent object over-flow */ if (o_max >= max_o_idx) { - /* Message */ #ifdef JP why = "アイテムが多すぎる"; #else @@ -1473,13 +1472,11 @@ why = "アイテムが多すぎる"; #endif - /* Message */ okay = FALSE; } /* Prevent monster over-flow */ else if (m_max >= max_m_idx) { - /* Message */ #ifdef JP why = "モンスターが多すぎる"; #else @@ -1487,14 +1484,12 @@ why = "モンスターが多すぎる"; #endif - /* Message */ okay = FALSE; } /* Accept */ if (okay) break; - /* Message */ #ifdef JP if (why) msg_format("生成やり直し(%s)", why); #else diff --git a/src/init2.c b/src/init2.c index dad20b617..5787661af 100644 --- a/src/init2.c +++ b/src/init2.c @@ -2287,7 +2287,6 @@ void init_angband(void) { char why[1024]; - /* Message */ sprintf(why, _("'%s'ファイルにアクセスできません!", "Cannot access the '%s' file!"), buf); /* Crash and burn */ @@ -2357,7 +2356,6 @@ void init_angband(void) { char why[1024]; - /* Message */ sprintf(why, _("'%s'ファイルを作成できません!", "Cannot create the '%s' file!"), buf); /* Crash and burn */ diff --git a/src/melee1.c b/src/melee1.c index 8b41721e3..1b37c5c13 100644 --- a/src/melee1.c +++ b/src/melee1.c @@ -416,7 +416,6 @@ static void natural_attack(s16b m_idx, int attack, bool *fear, bool *mdeath) { sound(SOUND_MISS); - /* Message */ msg_format(_("ミス！ %sにかわされた。", "You miss %s."), m_name); } } @@ -603,7 +602,6 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b sound(SOUND_HIT); - /* Message */ if (backstab) msg_format(_("あなたは冷酷にも眠っている無力な%sを突き刺した！", "You cruelly stab the helpless, sleeping %s!"), m_name); else if (fuiuchi) msg_format(_("不意を突いて%sに強烈な一撃を喰らわせた！", "You make surprise attack, and hit %s with a powerful blow!"), m_name); else if (stab_fleeing) msg_format(_("逃げる%sを背中から突き刺した！", "You backstab the fleeing %s!"), m_name); @@ -1198,9 +1196,7 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b sound(SOUND_HIT); - /* Message */ msg_format(_("ミス！ %sにかわされた。", "You miss %s."), m_name); - /* Message */ msg_print(_("振り回した大鎌が自分自身に返ってきた！", "Your scythe returns to you!")); /* Extract the flags */ @@ -1294,7 +1290,6 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b { sound(SOUND_MISS); - /* Message */ msg_format(_("ミス！ %sにかわされた。", "You miss %s."), m_name); } } @@ -1420,7 +1415,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode) /* Handle player fear */ if (p_ptr->afraid) { - /* Message */ if (m_ptr->ml) msg_format(_("恐くて%sを攻撃できない！", "You are too afraid to attack %s!"), m_name); else @@ -1509,7 +1503,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode) { sound(SOUND_FLEE); - /* Message */ msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name); } @@ -1646,7 +1639,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Remember the Evil-ness */ if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= RF3_EVIL; - /* Message */ #ifdef JP if (abbreviate) msg_format("撃退した。"); @@ -1934,7 +1926,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) } } - /* Message */ if (act) { if (do_silly_attack) @@ -2089,7 +2080,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Don't heal more than max hp */ heal = MIN(heal, m_ptr->maxhp - m_ptr->hp); - /* Message */ msg_print(_("ザックからエネルギーが吸い取られた！", "Energy drains from your pack!")); /* Obvious */ @@ -2230,7 +2220,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Get a description */ object_desc(o_name, o_ptr, OD_OMIT_PREFIX); - /* Message */ #ifdef JP msg_format("%s(%c)を%s盗まれた！", o_name, index_to_label(i), @@ -2326,7 +2315,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Get a description */ object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); - /* Message */ #ifdef JP msg_format("%s(%c)を%s食べられてしまった！", o_name, index_to_label(i), @@ -2389,7 +2377,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Obvious */ obvious = TRUE; - /* Message */ msg_print(_("酸を浴びせられた！", "You are covered in acid!")); /* Special damage */ @@ -2410,7 +2397,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Obvious */ obvious = TRUE; - /* Message */ msg_print(_("電撃を浴びせられた！", "You are struck by electricity!")); /* Special damage */ @@ -2428,7 +2414,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Obvious */ obvious = TRUE; - /* Message */ msg_print(_("全身が炎に包まれた！", "You are enveloped in flames!")); /* Special damage */ @@ -2446,7 +2431,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Obvious */ obvious = TRUE; - /* Message */ msg_print(_("全身が冷気で覆われた！", "You are covered with frost!")); /* Special damage */ @@ -3358,7 +3342,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Disturbing */ disturb(1, 1); - /* Message */ #ifdef JP if (abbreviate) msg_format("%sかわした。", (p_ptr->special_attack & ATTACK_SUIKEN) ? "奇妙な動きで" : ""); diff --git a/src/mind.c b/src/mind.c index 75322d0d6..1d3a89943 100644 --- a/src/mind.c +++ b/src/mind.c @@ -2136,7 +2136,6 @@ void do_cmd_mind(void) if ((p_ptr->csp - mana_cost) < 0) p_ptr->csp_frac = 0; p_ptr->csp = MAX(0, p_ptr->csp - mana_cost); - /* Message */ msg_format(_("%sを集中しすぎて気を失ってしまった！", "You faint from the effort!"),p); /* Hack -- Bypass free action */ @@ -2147,7 +2146,6 @@ void do_cmd_mind(void) { bool perm = (randint0(100) < 25); - /* Message */ msg_print(_("自分の精神を攻撃してしまった！", "You have damaged your mind!")); /* Reduce constitution */ diff --git a/src/monster-process.c b/src/monster-process.c index 067b2fdcf..5b6f37f14 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -1715,7 +1715,6 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx) } } - /* Message */ if (act && see_either) { #ifdef JP @@ -1993,7 +1992,6 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx) /* Visible monsters */ if (see_m) { - /* Message */ #ifdef JP msg_format("%sは%^sの攻撃をかわした。", t_name,m_name); #else @@ -2769,7 +2767,6 @@ void process_monster(MONSTER_IDX m_idx) /* Attempt to Bash XXX XXX XXX */ if (check_hp_for_feat_destruction(f_ptr, m_ptr) && (randint0(m_ptr->hp / 10) > f_ptr->power)) { - /* Message */ if (have_flag(f_ptr->flags, FF_GLASS)) msg_print(_("ガラスが砕ける音がした！", "You hear a glass was crashed!")); else diff --git a/src/mspells1.c b/src/mspells1.c index b54e917c3..a2bd23853 100644 --- a/src/mspells1.c +++ b/src/mspells1.c @@ -1801,7 +1801,6 @@ bool make_attack_spell(MONSTER_IDX m_idx) && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2)) || (randint0(100) < failrate))) { disturb(1, 1); - /* Message */ msg_format(_("%^sは呪文を唱えようとしたが失敗した。", "%^s tries to cast a spell, but fails."), m_name); return (TRUE); diff --git a/src/mspells2.c b/src/mspells2.c index 1ca8a65a1..f6b19883e 100644 --- a/src/mspells2.c +++ b/src/mspells2.c @@ -686,7 +686,6 @@ bool monst_spell_monst(MONSTER_IDX m_idx) if (!spell_is_inate(thrown_spell) && (in_no_magic_dungeon || (MON_STUNNED(m_ptr) && one_in_(2)))) { disturb(1, 1); - /* Message */ if (see_m) msg_format(_("%^sは呪文を唱えようとしたが失敗した。", "%^s tries to cast a spell, but fails."), m_name); diff --git a/src/mspells3.c b/src/mspells3.c index 56a3e97ff..450b5cd90 100644 --- a/src/mspells3.c +++ b/src/mspells3.c @@ -1569,7 +1569,6 @@ bool do_cmd_cast_learned(void) p_ptr->csp = 0; p_ptr->csp_frac = 0; - /* Message */ msg_print(_("精神を集中しすぎて気を失ってしまった！", "You faint from the effort!")); /* Hack -- Bypass free action */ @@ -1582,7 +1581,6 @@ bool do_cmd_cast_learned(void) { bool perm = (randint0(100) < 25); - /* Message */ msg_print(_("体を悪くしてしまった！", "You have damaged your health!")); /* Reduce constitution */ diff --git a/src/mspells4.c b/src/mspells4.c index cc5fff1f8..3fefa0b68 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -1801,7 +1801,6 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) disturb(1, 1); - /* Message */ monspell_message_base(m_idx, t_idx, _("%^sが何かをつぶやいた。", "%^s mumbles."), _("%^sは自分の傷に念を集中した。", "%^s concentrates on %s wounds."), @@ -1818,7 +1817,6 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) /* Fully healed */ m_ptr->hp = m_ptr->maxhp; - /* Message */ monspell_message_base(m_idx, t_idx, _("%^sは完全に治ったようだ！", "%^s sounds completely healed!"), _("%^sは完全に治ったようだ！", "%^s sounds completely healed!"), @@ -1830,7 +1828,6 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) /* Partially healed */ else { - /* Message */ monspell_message_base(m_idx, t_idx, _("%^sは体力を回復したようだ。", "%^s sounds healthier."), _("%^sは体力を回復したようだ。", "%^s sounds healthier."), @@ -1849,7 +1846,6 @@ void spell_RF6_HEAL(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) /* Cancel fear */ (void)set_monster_monfear(m_idx, 0); - /* Message */ if (see_monster(m_idx)) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name); } @@ -1866,7 +1862,6 @@ void spell_RF6_INVULNER(MONSTER_IDX m_idx, MONSTER_IDX t_idx, int TARGET_TYPE) monster_type *m_ptr = &m_list[m_idx]; bool seen = (!p_ptr->blind && m_ptr->ml); - /* Message */ monspell_message_base(m_idx, t_idx, _("%^sが何かを力強くつぶやいた。", "%^s mumbles powerfully."), _("%^sが何かを力強くつぶやいた。", "%^s mumbles powerfully."), diff --git a/src/object1.c b/src/object1.c index 8cd0a3f5d..6c5e085ab 100644 --- a/src/object1.c +++ b/src/object1.c @@ -5056,7 +5056,6 @@ void py_pickup_floor(bool pickup) /* Pick up gold */ if (o_ptr->tval == TV_GOLD) { - /* Message */ #ifdef JP msg_format(" $%ld の価値がある%sを見つけた。", (long)o_ptr->pval, o_name); @@ -5128,14 +5127,12 @@ void py_pickup_floor(bool pickup) /* Describe the object */ object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(_("%sがある。", "You see %s."), o_name); } /* Multiple objects */ else { - /* Message */ msg_format(_("%d 個のアイテムの山がある。", "You see a pile of %d items."), floor_num); } @@ -5166,14 +5163,12 @@ void py_pickup_floor(bool pickup) /* Describe the object */ object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name); } /* Multiple objects */ else { - /* Message */ msg_print(_("ザックには床にあるどのアイテムも入らない。", "You have no room for any of the objects on the floor.")); } diff --git a/src/object2.c b/src/object2.c index 605d3bf82..98e42f6aa 100644 --- a/src/object2.c +++ b/src/object2.c @@ -374,7 +374,6 @@ void compact_objects(int size) /* Compact */ if (size) { - /* Message */ msg_print(_("アイテム情報を圧縮しています...", "Compacting objects...")); /* Redraw map */ @@ -5162,7 +5161,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION /* Handle normal "breakage" */ if (!object_is_artifact(j_ptr) && (randint0(100) < chance)) { - /* Message */ #ifdef JP msg_format("%sは消えた。", o_name); #else @@ -5271,7 +5269,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION /* Handle lack of space */ if (!flag && !object_is_artifact(j_ptr)) { - /* Message */ #ifdef JP msg_format("%sは消えた。", o_name); #else @@ -5325,7 +5322,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION /* No valid place! */ if (!candidates) { - /* Message */ #ifdef JP msg_format("%sは消えた。", o_name); #else @@ -5408,7 +5404,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION /* Failure */ if (!done && !o_idx) { - /* Message */ #ifdef JP msg_format("%sは消えた。", o_name); #else @@ -6306,7 +6301,6 @@ INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt) /* Carry the object */ slot = inven_carry(q_ptr); - /* Message */ #ifdef JP msg_format("%s(%c)%s。", o_name, index_to_label(slot), act); #else @@ -6373,7 +6367,6 @@ void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt) /* Describe local object */ object_desc(o_name, q_ptr, 0); - /* Message */ msg_format(_("%s(%c)を落とした。", "You drop %s (%c)."), o_name, index_to_label(item)); /* Drop it near the player */ @@ -6494,7 +6487,6 @@ void combine_pack(void) } while (combined); - /* Message */ if (flag) msg_print(_("ザックの中のアイテムをまとめ直した。", "You combine some items in your pack.")); } @@ -6562,7 +6554,6 @@ void reorder_pack(void) p_ptr->window |= (PW_INVEN); } - /* Message */ if (flag) msg_print(_("ザックの中のアイテムを並べ直した。", "You reorder some items in your pack.")); } diff --git a/src/racial.c b/src/racial.c index 313b01909..4e46cad13 100644 --- a/src/racial.c +++ b/src/racial.c @@ -335,7 +335,6 @@ bool gain_magic(void) } object_desc(o_name, o_ptr, 0); - /* Message */ msg_format(_("%sの魔力を取り込んだ。", "You absorb magic of %s."), o_name); /* Eliminate the item (from the pack) */ diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c index 6ee68da1f..2d9338c3e 100644 --- a/src/rooms-pitnest.c +++ b/src/rooms-pitnest.c @@ -1514,7 +1514,6 @@ bool build_type13(void) if (cheat_hear) { - /* Message */ msg_print(r_name + r_info[what[i]].name); } } diff --git a/src/rooms-vault.c b/src/rooms-vault.c index e32f53e74..bd915d955 100644 --- a/src/rooms-vault.c +++ b/src/rooms-vault.c @@ -647,7 +647,6 @@ bool build_type7(void) v_ptr = &v_info[2]; #endif - /* Message */ msg_format_wizard(CHEAT_DUNGEON, _("小型Vault(%s)を生成しました。", "Lesser vault (%s)."), v_name + v_ptr->name); /* Hack -- Build the vault */ @@ -1251,7 +1250,6 @@ bool build_type17(void) v_ptr = &v_info[2]; #endif - /* Message */ msg_format_wizard(CHEAT_DUNGEON, _("特殊固定部屋(%s)を生成しました。", "Special Fix room (%s)."), v_name + v_ptr->name); /* Hack -- Build the vault */ diff --git a/src/save.c b/src/save.c index 7a1a56032..a3799385f 100644 --- a/src/save.c +++ b/src/save.c @@ -1845,7 +1845,6 @@ bool load_player(void) /* Close the file */ my_fclose(fkk); - /* Message */ msg_print(_("セーブファイルは現在使用中です。", "Savefile is currently in use.")); msg_print(NULL); @@ -1937,7 +1936,6 @@ bool load_player(void) if (sf_when > (statbuf.st_ctime + 100) || sf_when < (statbuf.st_ctime - 100)) { - /* Message */ what = _("無効なタイム・スタンプです", "Invalid timestamp"); /* Oops */ @@ -1961,7 +1959,6 @@ bool load_player(void) } else { - /* Message */ #ifdef JP msg_format("バージョン %d.%d.%d 用のセーブ・ファイルを変換しました。", (z_major > 9) ? z_major-10 : z_major , z_minor, z_patch); @@ -2031,7 +2028,6 @@ bool load_player(void) #endif - /* Message */ #ifdef JP msg_format("エラー(%s)がバージョン%d.%d.%d 用セーブファイル読み込み中に発生。", what, (z_major>9) ? z_major - 10 : z_major, z_minor, z_patch); diff --git a/src/spells1.c b/src/spells1.c index 843ffb1db..471f74078 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -872,7 +872,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Check line of sight */ if (known) { - /* Message */ msg_print(_("まばゆい閃光が走った！", "There is a bright flash of light!")); obvious = TRUE; } @@ -915,7 +914,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Check line of sight */ if (known && have_flag(mimic_f_ptr->flags, FF_OPEN)) { - /* Message */ msg_format(_("%sに何かがつっかえて開かなくなった。", "The %s seems stuck."), f_name + mimic_f_ptr->name); obvious = TRUE; } @@ -928,7 +926,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P { if (have_flag(f_ptr->flags, FF_HURT_ROCK)) { - /* Message */ if (known && (c_ptr->info & (CAVE_MARK))) { msg_format(_("%sが溶けて泥になった！", "The %s turns into mud!"), f_name + f_info[get_feat_mimic(c_ptr)].name); @@ -1177,7 +1174,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 50)) { - /* Message */ if (known && (c_ptr->info & CAVE_MARK)) { msg_format(_("%sが割れた！", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name); @@ -1205,7 +1201,6 @@ static bool project_f(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P if (have_flag(f_ptr->flags, FF_GLASS) && !have_flag(f_ptr->flags, FF_PERMANENT) && (dam >= 200)) { - /* Message */ if (known && (c_ptr->info & CAVE_MARK)) { msg_format(_("%sが割れた！", "The %s was crashed!"), f_name + f_info[get_feat_mimic(c_ptr)].name); @@ -3014,7 +3009,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P if (p_ptr->health_who == c_ptr->m_idx) p_ptr->redraw |= (PR_HEALTH); if (p_ptr->riding == c_ptr->m_idx) p_ptr->redraw |= (PR_UHEALTH); - /* Message */ note = _("は体力を回復したようだ。", " looks healthier."); /* No "real" damage */ @@ -3871,7 +3865,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Learn about type */ if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_UNDEAD); - /* Message */ note = _("は身震いした。", " shudders."); note_dies = _("はドロドロに溶けた！", " dissolves!"); } @@ -3908,7 +3901,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Learn about type */ if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_EVIL); - /* Message */ note = _("は身震いした。", " shudders."); note_dies = _("はドロドロに溶けた！", " dissolves!"); } @@ -3944,7 +3936,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Learn about type */ if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD); - /* Message */ note = _("は身震いした。", " shudders."); note_dies = _("はドロドロに溶けた！", " dissolves!"); } @@ -3977,7 +3968,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Obvious */ if (seen) obvious = TRUE; - /* Message */ note = _("は身震いした。", " shudders."); note_dies = _("はドロドロに溶けた！", " dissolves!"); } @@ -4013,7 +4003,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Learn about type */ if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_DEMON); - /* Message */ note = _("は身震いした。", " shudders."); note_dies = _("はドロドロに溶けた！", " dissolves!"); } @@ -4043,7 +4032,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Obvious */ if (seen) obvious = TRUE; - /* Message */ note = _("は身震いした。", " shudders."); note_dies = _("はドロドロに溶けた！", " dissolves!"); break; @@ -4088,7 +4076,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P } else { - /* Message */ msg_format(_("%sから精神エネルギーを吸いとった。", "You draw psychic energy from %s."), m_name); (void)hp_player(dam); } @@ -4105,7 +4092,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P case GF_MIND_BLAST: { if (seen) obvious = TRUE; - /* Message */ if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) @@ -4156,7 +4142,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P case GF_BRAIN_SMASH: { if (seen) obvious = TRUE; - /* Message */ if (!who) msg_format(_("%sをじっと睨んだ。", "You gaze intently at %s."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) @@ -4216,7 +4201,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P case GF_CAUSE_1: { if (seen) obvious = TRUE; - /* Message */ if (!who) msg_format(_("%sを指差して呪いをかけた。", "You point at %s and curse."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) @@ -4240,7 +4224,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P case GF_CAUSE_2: { if (seen) obvious = TRUE; - /* Message */ if (!who) msg_format(_("%sを指差して恐ろしげに呪いをかけた。", "You point at %s and curse horribly."), m_name); if (r_ptr->flagsr & RFR_RES_ALL) @@ -4264,7 +4247,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P case GF_CAUSE_3: { if (seen) obvious = TRUE; - /* Message */ if (!who) msg_format(_("%sを指差し、恐ろしげに呪文を唱えた！", "You point at %s, incanting terribly!"), m_name); if (r_ptr->flagsr & RFR_RES_ALL) @@ -4288,7 +4270,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P case GF_CAUSE_4: { if (seen) obvious = TRUE; - /* Message */ if (!who) msg_format(_("%sの秘孔を突いて、「お前は既に死んでいる」と叫んだ。", "You point at %s, screaming the word, 'DIE!'."), m_name); @@ -4812,7 +4793,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Obvious */ if (seen) obvious = TRUE; - /* Message */ note = _("が消え去った！", " disappears!"); if (!who) chg_virtue(V_VALOUR, -1); @@ -4966,7 +4946,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P { sound(SOUND_FLEE); - /* Message */ msg_format(_("%^sは恐怖して逃げ出した！", "%^s flees in terror!"), m_name); } diff --git a/src/spells2.c b/src/spells2.c index 678c5fbd8..6dd8ead5f 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -1772,7 +1772,6 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate) /* Hack -- Affect player */ if (flag) { - /* Message */ msg_print(_("燃えるような閃光が発生した！", "There is a searing blast of light!")); /* Blind the player */ @@ -2114,7 +2113,6 @@ bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx) /* Delete (not kill) "dead" monsters */ if (m_ptr->hp < 0) { - /* Message */ if (!ignore_unview || is_seen(m_ptr)) msg_format(_("%^sは岩石に埋もれてしまった！", "%^s is embedded in the rock!"), m_name); @@ -4271,7 +4269,6 @@ void ring_of_power(DIRECTION dir) case 1: case 2: { - /* Message */ msg_print(_("あなたは悪性のオーラに包み込まれた。", "You are surrounded by a malignant aura.")); sound(SOUND_EVIL); @@ -4293,7 +4290,6 @@ void ring_of_power(DIRECTION dir) case 3: { - /* Message */ msg_print(_("あなたは強力なオーラに包み込まれた。", "You are surrounded by a powerful aura.")); /* Dispel monsters */ diff --git a/src/spells3.c b/src/spells3.c index a217cb86d..caf5088f3 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -998,7 +998,6 @@ bool apply_disenchant(BIT_FLAGS mode) /* Artifacts have 71% chance to resist */ if (object_is_artifact(o_ptr) && (randint0(100) < 71)) { - /* Message */ #ifdef JP msg_format("%s(%c)は劣化を跳ね返した！",o_name, index_to_label(t) ); #else @@ -1038,7 +1037,6 @@ msg_format("%s(%c)は劣化を跳ね返した！",o_name, index_to_label(t) ); if ((to_h != o_ptr->to_h) || (to_d != o_ptr->to_d) || (to_a != o_ptr->to_a) || (pval != o_ptr->pval)) { - /* Message */ #ifdef JP msg_format("%s(%c)は劣化してしまった！", o_name, index_to_label(t) ); @@ -1185,7 +1183,6 @@ void phlogiston(void) /* Refuel */ o_ptr->xtra4 += (XTRA16)(max_flog / 2); - /* Message */ msg_print(_("照明用アイテムに燃素を補充した。", "You add phlogiston to your light item.")); /* Comment */ @@ -2010,7 +2007,6 @@ bool alchemy(void) /* Artifacts cannot be destroyed */ if (!can_player_destroy_object(o_ptr)) { - /* Message */ msg_format(_("%sを金に変えることに失敗した。", "You fail to turn %s to gold!"), o_name); /* Done */ @@ -2021,7 +2017,6 @@ bool alchemy(void) if (price <= 0) { - /* Message */ msg_format(_("%sをニセの金に変えた。", "You turn %s to fool's gold."), o_name); } else @@ -2274,7 +2269,6 @@ msg_format("%s は明るく輝いた！", /* Flush */ if (flush_failure) flush(); - /* Message */ msg_print(_("強化に失敗した。", "The enchantment failed.")); if (one_in_(3)) chg_virtue(V_ENCHANT, -1); @@ -2405,7 +2399,6 @@ bool artifact_scroll(void) /* Flush */ if (flush_failure) flush(); - /* Message */ msg_print(_("強化に失敗した。", "The enchantment failed.")); if (one_in_(3)) chg_virtue(V_ENCHANT, -1); @@ -4396,7 +4389,6 @@ int inven_damage(inven_func typ, int perc) /* Get a description */ object_desc(o_name, o_ptr, OD_OMIT_PREFIX); - /* Message */ msg_format(_("%s(%c)が%s壊れてしまった！", "%sour %s (%c) %s destroyed!"), #ifdef JP @@ -4490,7 +4482,6 @@ static int minus_ac(void) return (TRUE); } - /* Message */ msg_format(_("%sがダメージを受けた！", "Your %s is damaged!"), o_name); /* Damage the item */ @@ -4959,7 +4950,6 @@ bool brand_bolts(void) /* Randomize */ if (randint0(100) < 75) continue; - /* Message */ msg_print(_("クロスボウの矢が炎のオーラに包まれた！", "Your bolts are covered in a fiery aura!")); /* Ego-item */ @@ -5319,7 +5309,6 @@ bool eat_magic(int power) p_ptr->total_weight -= q_ptr->weight; item = inven_carry(q_ptr); - /* Message */ msg_print(_("杖をまとめなおした。", "You unstack your staff.")); } } diff --git a/src/store.c b/src/store.c index ff3d403dd..b303cf953 100644 --- a/src/store.c +++ b/src/store.c @@ -3233,7 +3233,6 @@ static bool sell_haggle(object_type *o_ptr, s32b *price) /* No reason to haggle */ if (final_ask >= purse) { - /* Message */ #ifdef JP msg_print("即座にこの金額にまとまった。"); #else @@ -3249,7 +3248,6 @@ static bool sell_haggle(object_type *o_ptr, s32b *price) /* No need to haggle */ else if (noneed) { - /* Message */ #ifdef JP msg_print("結局この金額にまとまった。"); #else @@ -3621,7 +3619,6 @@ msg_format("一つにつき $%ldです。", (long)(best)); /* Describe the object (fully) */ object_desc(o_name, j_ptr, 0); - /* Message */ #ifdef JP msg_format("%s(%c)を購入する。", o_name, I2A(item)); #else @@ -3675,7 +3672,6 @@ msg_format("一つにつき $%ldです。", (long)(best)); /* Describe the transaction */ object_desc(o_name, j_ptr, 0); - /* Message */ #ifdef JP msg_format("%sを $%ldで購入しました。", o_name, (long)price); #else @@ -3702,7 +3698,6 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price); /* Describe the final result */ object_desc(o_name, &inventory[item_new], 0); - /* Message */ #ifdef JP msg_format("%s(%c)を手に入れた。", o_name, index_to_label(item_new)); #else @@ -3736,7 +3731,6 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price); if (one_in_(STORE_SHUFFLE)) { char buf[80]; - /* Message */ #ifdef JP msg_print("店主は引退した。"); #else @@ -3759,7 +3753,6 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price); /* Maintain */ else { - /* Message */ #ifdef JP msg_print("店主は新たな在庫を取り出した。"); #else @@ -3828,7 +3821,6 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price); /* Describe just the result */ object_desc(o_name, &inventory[item_new], 0); - /* Message */ #ifdef JP msg_format("%s(%c)を取った。", #else @@ -4444,7 +4436,6 @@ static void museum_remove_object(void) if (!get_check(format("Really order to remove %s from the Museum? ", o_name))) return; #endif - /* Message */ #ifdef JP msg_format("%sの展示をやめさせた。", o_name); #else @@ -5134,7 +5125,6 @@ void do_cmd_store(void) /* Hack -- Flee from the store */ if (cur_store_num != STORE_HOME) { - /* Message */ #ifdef JP if (cur_store_num == STORE_MUSEUM) msg_print("ザックからアイテムがあふれそうなので、あわてて博物館から出た..."); @@ -5155,7 +5145,6 @@ void do_cmd_store(void) /* Hack -- Flee from the home */ else if (!store_check_num(o_ptr)) { - /* Message */ #ifdef JP msg_print("ザックからアイテムがあふれそうなので、あわてて家から出た..."); #else @@ -5195,7 +5184,6 @@ void do_cmd_store(void) /* Describe it */ object_desc(o_name, q_ptr, 0); - /* Message */ #ifdef JP msg_format("%sが落ちた。(%c)", o_name, index_to_label(item)); #else diff --git a/src/wizard1.c b/src/wizard1.c index 4d3d71232..8e43946d9 100644 --- a/src/wizard1.c +++ b/src/wizard1.c @@ -468,7 +468,6 @@ static void spoil_obj_desc(cptr fname) return; } - /* Message */ msg_print("Successfully created a spoiler file."); } @@ -1752,7 +1751,6 @@ static void spoil_artifact(cptr fname) return; } - /* Message */ msg_print("Successfully created a spoiler file."); } @@ -2518,7 +2516,6 @@ static void spoil_mon_evol(cptr fname) return; } - /* Message */ msg_print("Successfully created a spoiler file."); } @@ -2787,7 +2784,6 @@ void spoil_random_artifact(cptr fname) return; } - /* Message */ msg_print("Successfully created a list file."); } diff --git a/src/wizard2.c b/src/wizard2.c index dcbccd8db..f54b8b7f4 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -79,7 +79,6 @@ void do_cmd_rerate(bool display) /* Handle stuff */ handle_stuff(); - /* Message */ if (display) { msg_format(_("現在の体力ランクは %d/100 です。", "Your life rate is %d/100 now."), percent); @@ -1368,7 +1367,6 @@ static void do_cmd_wiz_play(void) /* Accept change */ if (changed) { - /* Message */ msg_print("Changes accepted."); /* Recalcurate object's weight */ diff --git a/src/xtra1.c b/src/xtra1.c index 5b0f2d2f3..6adfe1331 100644 --- a/src/xtra1.c +++ b/src/xtra1.c @@ -2329,7 +2329,6 @@ static void calc_spells(void) which = p_ptr->realm2; } - /* Message */ #ifdef JP msg_format("%sの%sを忘れてしまった。", do_spell(which, j%32, SPELL_NAME), p ); #else @@ -2387,7 +2386,6 @@ static void calc_spells(void) which = p_ptr->realm2; } - /* Message */ #ifdef JP msg_format("%sの%sを忘れてしまった。", do_spell(which, j%32, SPELL_NAME), p ); @@ -2463,7 +2461,6 @@ static void calc_spells(void) which = p_ptr->realm2; } - /* Message */ #ifdef JP msg_format("%sの%sを思い出した。", do_spell(which, j%32, SPELL_NAME), p ); #else @@ -2514,7 +2511,6 @@ static void calc_spells(void) /* Message if needed */ if (p_ptr->new_spells) { - /* Message */ #ifdef JP if( p_ptr->new_spells < 10 ){ msg_format("あと %d つの%sを学べる。", p_ptr->new_spells, p); @@ -2824,7 +2820,6 @@ static void calc_mana(void) /* Take note when "glove state" changes */ if (p_ptr->old_cumber_glove != p_ptr->cumber_glove) { - /* Message */ if (p_ptr->cumber_glove) { msg_print(_("手が覆われて呪文が唱えにくい感じがする。", "Your covered hands feel unsuitable for spellcasting.")); @@ -2842,7 +2837,6 @@ static void calc_mana(void) /* Take note when "armor state" changes */ if (p_ptr->old_cumber_armor != p_ptr->cumber_armor) { - /* Message */ if (p_ptr->cumber_armor) { msg_print(_("装備の重さで動きが鈍くなってしまっている。", "The weight of your equipment encumbers your movement.")); @@ -5619,7 +5613,6 @@ void calc_bonuses(void) /* Take note when "heavy bow" changes */ if (p_ptr->old_heavy_shoot != p_ptr->heavy_shoot) { - /* Message */ if (p_ptr->heavy_shoot) { msg_print(_("こんな重い弓を装備しているのは大変だ。", "You have trouble wielding such a heavy bow.")); @@ -5642,7 +5635,6 @@ void calc_bonuses(void) /* Take note when "heavy weapon" changes */ if (p_ptr->old_heavy_wield[i] != p_ptr->heavy_wield[i]) { - /* Message */ if (p_ptr->heavy_wield[i]) { msg_print(_("こんな重い武器を装備しているのは大変だ。", "You have trouble wielding such a heavy weapon.")); @@ -5667,7 +5659,6 @@ void calc_bonuses(void) /* Take note when "heavy weapon" changes */ if (p_ptr->old_riding_wield[i] != p_ptr->riding_wield[i]) { - /* Message */ if (p_ptr->riding_wield[i]) { msg_print(_("この武器は乗馬中に使うにはむかないようだ。", "This weapon is not suitable for use while riding.")); @@ -5687,7 +5678,6 @@ void calc_bonuses(void) /* Take note when "illegal weapon" changes */ if (p_ptr->old_icky_wield[i] != p_ptr->icky_wield[i]) { - /* Message */ if (p_ptr->icky_wield[i]) { msg_print(_("今の装備はどうも自分にふさわしくない気がする。", "You do not feel comfortable with your weapon.")); @@ -5712,7 +5702,6 @@ void calc_bonuses(void) if (p_ptr->riding && (p_ptr->old_riding_ryoute != p_ptr->riding_ryoute)) { - /* Message */ if (p_ptr->riding_ryoute) { #ifdef JP diff --git a/src/xtra2.c b/src/xtra2.c index c7e2a03ea..0dad02e69 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -102,7 +102,6 @@ void check_experience(void) sound(SOUND_LEVEL); - /* Message */ msg_format(_("レベル %d にようこそ。", "Welcome to level %d."), p_ptr->lev); /* Update some stuff */ @@ -3225,7 +3224,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info) /* Describe the object */ object_desc(o_name, o_ptr, 0); - /* Message */ #ifdef JP sprintf(out_val, "%s%s%s%s[%s]", s1, o_name, s2, s3, info); diff --git a/src/z-virt.c b/src/z-virt.c index b3d74a25f..53f4f8f39 100644 --- a/src/z-virt.c +++ b/src/z-virt.c @@ -43,7 +43,6 @@ vptr rnfree(vptr p, huge len) /* Decrease memory count */ virt_kill += len; - /* Message */ if (len > virt_size) { char buf[80]; -- 2.11.0