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

[hengband/hengband.git] / src / xtra2.c

diff --git a/src/xtra2.c b/src/xtra2.c
index eb73a71..be978c4 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -49,8 +49,6 @@ void check_experience(void)
 
        /* Redraw experience */
        p_ptr->redraw |= (PR_EXP);
-
-       /* Handle stuff */
        handle_stuff();
 
 
@@ -60,16 +58,9 @@ void check_experience(void)
        {
                /* Lose a level */
                p_ptr->lev--;
-
-               /* Update some stuff */
                p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
-               /* Redraw some stuff */
                p_ptr->redraw |= (PR_LEV | PR_TITLE);
-
                p_ptr->window |= (PW_PLAYER);
-
-               /* Handle stuff */
                handle_stuff();
        }
 
@@ -104,18 +95,12 @@ void check_experience(void)
 
                msg_format(_("レベル %d にようこそ。", "Welcome to level %d."), p_ptr->lev);
 
-               /* Update some stuff */
                p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
-               /* Redraw some stuff */
                p_ptr->redraw |= (PR_LEV | PR_TITLE | PR_EXP);
-
                p_ptr->window |= (PW_PLAYER | PW_SPELL | PW_INVEN);
 
                /* HPとMPの上昇量を表示 */
                level_up = 1;
-
-               /* Handle stuff */
                handle_stuff();
 
                level_up = 0;
@@ -196,15 +181,9 @@ void check_experience(void)
                        level_reward = FALSE;
                }
 
-               /* Update some stuff */
                p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
-               /* Redraw some stuff */
                p_ptr->redraw |= (PR_LEV | PR_TITLE);
-
                p_ptr->window |= (PW_PLAYER | PW_SPELL);
-
-               /* Handle stuff */
                handle_stuff();
        }
 
@@ -646,7 +625,6 @@ void check_quest_completion(monster_type *m_ptr)
 
                for (i = 0; i < (dun_level / 15)+1; i++)
                {
-                       /* Get local object */
                        o_ptr = &forge;
                        object_wipe(o_ptr);
 
@@ -728,15 +706,14 @@ cptr extract_note_dies(monster_race *r_ptr)
  */
 void monster_death(MONSTER_IDX m_idx, bool drop_item)
 {
-       int i, j, y, x;
+       int i, j;
+       POSITION y, x;
 
        int dump_item = 0;
        int dump_gold = 0;
-
        int number = 0;
 
        monster_type *m_ptr = &m_list[m_idx];
-
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
        bool visible = ((m_ptr->ml && !p_ptr->image) || (r_ptr->flags1 & RF1_UNIQUE));
@@ -817,12 +794,10 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                if (arena_info[p_ptr->arena_number].tval)
                {
-                       /* Get local object */
                        q_ptr = &forge;
 
                        /* Prepare to make a prize */
                        object_prep(q_ptr, lookup_kind(arena_info[p_ptr->arena_number].tval, arena_info[p_ptr->arena_number].sval));
-
                        apply_magic(q_ptr, object_level, AM_NO_FIXED_ART);
 
                        /* Drop it in the dungeon */
@@ -880,8 +855,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                                if (!one_in_(5)) corpse = TRUE;
                        }
                }
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Prepare to make an object */
@@ -933,7 +906,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                /* Bloodletters of Khorne may drop a blade of chaos */
                if (drop_chosen_item && (randint1(100) < 15))
                {
-                       /* Get local object */
                        q_ptr = &forge;
 
                        /* Prepare to make a Blade of Chaos */
@@ -949,7 +921,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        case MON_RAAL:
                if (drop_chosen_item && (dun_level > 9))
                {
-                       /* Get local object */
                        q_ptr = &forge;
                        object_wipe(q_ptr);
 
@@ -1053,8 +1024,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
        case MON_SERPENT:
                if (!drop_chosen_item) break;
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Mega-Hack -- Prepare to make "Grond" */
@@ -1068,8 +1037,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                /* Drop it in the dungeon */
                (void)drop_near(q_ptr, -1, y, x);
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Mega-Hack -- Prepare to make "Chaos" */
@@ -1088,7 +1055,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        case MON_B_DEATH_SWORD:
                if (drop_chosen_item)
                {
-                       /* Get local object */
                        q_ptr = &forge;
 
                        /* Prepare to make a broken sword */
@@ -1104,7 +1070,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                if (drop_chosen_item && ((m_ptr->r_idx == MON_A_GOLD) ||
                     ((m_ptr->r_idx == MON_A_SILVER) && (r_ptr->r_akills % 5 == 0))))
                {
-                       /* Get local object */
                        q_ptr = &forge;
 
                        /* Prepare to make a Can of Toys */
@@ -1132,7 +1097,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                case '(':
                        if (dun_level > 0)
                        {
-                               /* Get local object */
                                q_ptr = &forge;
                                object_wipe(q_ptr);
 
@@ -1150,7 +1114,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                case '/':
                        if (dun_level > 4)
                        {
-                               /* Get local object */
                                q_ptr = &forge;
                                object_wipe(q_ptr);
 
@@ -1168,7 +1131,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                case '[':
                        if (dun_level > 19)
                        {
-                               /* Get local object */
                                q_ptr = &forge;
                                object_wipe(q_ptr);
 
@@ -1186,7 +1148,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                case '\\':
                        if (dun_level > 4)
                        {
-                               /* Get local object */
                                q_ptr = &forge;
                                object_wipe(q_ptr);
 
@@ -1204,7 +1165,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                case '|':
                        if (m_ptr->r_idx != MON_STORMBRINGER)
                        {
-                               /* Get local object */
                                q_ptr = &forge;
                                object_wipe(q_ptr);
 
@@ -1282,7 +1242,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                        if (k_idx)
                        {
-                               /* Get local object */
                                q_ptr = &forge;
 
                                /* Prepare to make a reward */
@@ -1324,7 +1283,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        /* Drop some objects */
        for (j = 0; j < number; j++)
        {
-               /* Get local object */
                q_ptr = &forge;
                object_wipe(q_ptr);
 
@@ -1698,7 +1656,6 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
 #ifdef WORLD_SCORE
                        if (m_ptr->r_idx == MON_SERPENT)
                        {
-                               /* Make screen dump */
                                screen_dump = make_screen_dump();
                        }
 #endif
@@ -2107,8 +2064,6 @@ bool change_panel(POSITION dy, POSITION dx)
                p_ptr->update |= (PU_MONSTERS);
 
                p_ptr->redraw |= (PR_MAP);
-
-               /* Handle stuff */
                handle_stuff();
 
                /* Success */
@@ -2249,9 +2204,7 @@ void verify_panel(void)
        panel_bounds_center();
 
        p_ptr->update |= (PU_MONSTERS);
-
        p_ptr->redraw |= (PR_MAP);
-
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
 }
 
@@ -2262,8 +2215,8 @@ void verify_panel(void)
 cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
 {
        monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
-       bool         living;
-       int          perc;
+       bool living;
+       int perc;
        cptr desc;
        cptr attitude;
        cptr clone;
@@ -2277,55 +2230,29 @@ cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
        /* Healthy monsters */
        if (m_ptr->hp >= m_ptr->maxhp)
        {
-               /* No damage */
-#ifdef JP
-               desc = living ? "無傷" : "無ダメージ";
-#else
-               desc = living ? "unhurt" : "undamaged";
-#endif
-
+               desc = living ? _("無傷", "unhurt") : _("無ダメージ", "undamaged");
        }
 
        else if (perc >= 60)
        {
-#ifdef JP
-               desc = living ? "軽傷" : "小ダメージ";
-#else
-               desc = living ? "somewhat wounded" : "somewhat damaged";
-#endif
-
+               desc = living ? _("軽傷", "somewhat wounded") : _("小ダメージ", "somewhat damaged");
        }
 
        else if (perc >= 25)
        {
-#ifdef JP
-               desc = living ? "負傷" : "中ダメージ";
-#else
-               desc = living ? "wounded" : "damaged";
-#endif
-
+               desc = living ? _("負傷", "wounded") : _("中ダメージ", "damaged");
        }
 
        else if (perc >= 10)
        {
-#ifdef JP
-               desc = living ? "重傷" : "大ダメージ";
-#else
-               desc = living ? "badly wounded" : "badly damaged";
-#endif
-
+               desc = living ? _("重傷", "badly wounded") : _("大ダメージ", "badly damaged");
        }
 
        else 
        {
-#ifdef JP
-               desc = living ? "半死半生" : "倒れかけ";
-#else
-               desc = living ? "almost dead" : "almost destroyed";
-#endif
+               desc = living ? _("半死半生", "almost dead") : _("倒れかけ", "almost destroyed");
        }
 
-
        /* Need attitude information? */
        if (!(mode & 0x01))
        {
@@ -2345,7 +2272,6 @@ cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
                attitude = _("", "");
        }
 
-
        /* Clone monster? */
        if (m_ptr->smart & SM_CLONED)
        {
@@ -2365,6 +2291,7 @@ cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
        {
                return format(_("レベル???, %s%s%s", "Level ???, %s%s%s"), desc, attitude, clone);
        }
+
 }
 
 
@@ -2719,8 +2646,6 @@ static bool target_set_accept(POSITION y, POSITION x)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -2998,8 +2923,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 
                /* Hack -- health bar for this monster */
                health_track(c_ptr->m_idx);
-
-               /* Hack -- handle stuff */
                handle_stuff();
 
                /* Interact */
@@ -3089,8 +3012,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                        char o_name[MAX_NLEN];
 
                        object_type *o_ptr;
-
-                       /* Acquire object */
                        o_ptr = &o_list[this_o_idx];
 
                        /* Acquire next object */
@@ -3139,8 +3060,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                                char o_name[MAX_NLEN];
 
                                object_type *o_ptr;
-
-                               /* Acquire object */
                                o_ptr = &o_list[floor_list[0]];
 
                                object_desc(o_name, o_ptr, 0);
@@ -3166,11 +3085,9 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                        {
                                /* Display rough information about items */
 #ifdef JP
-                               sprintf(out_val, "%s %d個のアイテム%s%s ['x'で一覧, %s]",
-                                       s1, (int)floor_num, s2, s3, info);
+                               sprintf(out_val, "%s %d個のアイテム%s%s ['x'で一覧, %s]", s1, (int)floor_num, s2, s3, info);
 #else
-                               sprintf(out_val, "%s%s%sa pile of %d items [x,%s]",
-                                       s1, s2, s3, (int)floor_num, info);
+                               sprintf(out_val, "%s%s%sa pile of %d items [x,%s]", s1, s2, s3, (int)floor_num, info);
 #endif
 
                                prt(out_val, 0, 0);
@@ -3191,8 +3108,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                        {
                                int i;
                                OBJECT_IDX o_idx;
-
-                               /* Save screen */
                                screen_save();
 
                                /* Display */
@@ -3202,19 +3117,13 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 
                                /* Prompt */
 #ifdef JP
-                               sprintf(out_val, "%s %d個のアイテム%s%s [Enterで次へ, %s]",
-                                       s1, (int)floor_num, s2, s3, info);
+                               sprintf(out_val, "%s %d個のアイテム%s%s [Enterで次へ, %s]", s1, (int)floor_num, s2, s3, info);
 #else
-                               sprintf(out_val, "%s%s%sa pile of %d items [Enter,%s]",
-                                       s1, s2, s3, (int)floor_num, info);
+                               sprintf(out_val, "%s%s%sa pile of %d items [Enter,%s]", s1, s2, s3, (int)floor_num, info);
 #endif
                                prt(out_val, 0, 0);
 
-
-                               /* Wait */
                                query = inkey();
-
-                               /* Load screen */
                                screen_load();
 
                                /* Exit unless 'Enter' */
@@ -3251,8 +3160,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -3637,8 +3544,6 @@ bool target_set(BIT_FLAGS mode)
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
-
-                                       /* Handle stuff */
                                        handle_stuff();
 
                                        /* Recalculate interesting grids */
@@ -3727,8 +3632,6 @@ bool target_set(BIT_FLAGS mode)
                                                p_ptr->redraw |= (PR_MAP);
 
                                                p_ptr->window |= (PW_OVERHEAD);
-
-                                               /* Handle stuff */
                                                handle_stuff();
 
                                                /* Recalculate interesting grids */
@@ -3845,8 +3748,6 @@ bool target_set(BIT_FLAGS mode)
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
-
-                                       /* Handle stuff */
                                        handle_stuff();
 
                                        /* Recalculate interesting grids */
@@ -3969,8 +3870,6 @@ bool target_set(BIT_FLAGS mode)
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD);
-
-       /* Handle stuff */
        handle_stuff();
 
        /* Failure to set target */
@@ -4512,8 +4411,6 @@ void gain_level_reward(int chosen_reward)
 
                        msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
                        msg_print(_("「汝の行いは貴き剣に値せり。」", "'Thy deed hath earned thee a worthy blade.'"));
-
-                       /* Get local object */
                        q_ptr = &forge;
                        dummy = TV_SWORD;
                        switch (randint1(p_ptr->lev))
@@ -5123,8 +5020,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
-
-                                       /* Handle stuff */
                                        handle_stuff();
                                }
                                else    /* move cursor to next stair and change panel */
@@ -5211,8 +5106,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD);
-
-       /* Handle stuff */
        handle_stuff();
 
        *x_ptr = x;