[Refactor] #37353 コメント整理 / Refactor comments.

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

diff --git a/src/xtra2.c b/src/xtra2.c
index 9a0f433..ef0e194 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();
 
 
@@ -68,8 +66,6 @@ void check_experience(void)
                p_ptr->redraw |= (PR_LEV | PR_TITLE);
 
                p_ptr->window |= (PW_PLAYER);
-
-               /* Handle stuff */
                handle_stuff();
        }
 
@@ -114,8 +110,6 @@ void check_experience(void)
 
                /* HPとMPの上昇量を表示 */
                level_up = 1;
-
-               /* Handle stuff */
                handle_stuff();
 
                level_up = 0;
@@ -203,8 +197,6 @@ void check_experience(void)
                p_ptr->redraw |= (PR_LEV | PR_TITLE);
 
                p_ptr->window |= (PW_PLAYER | PW_SPELL);
-
-               /* Handle stuff */
                handle_stuff();
        }
 
@@ -646,7 +638,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);
 
@@ -817,7 +808,6 @@ 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 */
@@ -880,8 +870,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 +921,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 +936,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 +1039,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 +1052,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 +1070,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 +1085,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 +1112,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 +1129,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 +1146,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 +1163,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 +1180,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 +1257,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 +1298,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);
 
@@ -2107,8 +2080,6 @@ bool change_panel(POSITION dy, POSITION dx)
                p_ptr->update |= (PU_MONSTERS);
 
                p_ptr->redraw |= (PR_MAP);
-
-               /* Handle stuff */
                handle_stuff();
 
                /* Success */
@@ -2719,8 +2690,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 */
@@ -3089,8 +3058,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 +3106,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 +3131,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);
@@ -3200,19 +3163,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' */
@@ -3249,8 +3206,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 */
@@ -3635,8 +3590,6 @@ bool target_set(BIT_FLAGS mode)
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
-
-                                       /* Handle stuff */
                                        handle_stuff();
 
                                        /* Recalculate interesting grids */
@@ -3725,8 +3678,6 @@ bool target_set(BIT_FLAGS mode)
                                                p_ptr->redraw |= (PR_MAP);
 
                                                p_ptr->window |= (PW_OVERHEAD);
-
-                                               /* Handle stuff */
                                                handle_stuff();
 
                                                /* Recalculate interesting grids */
@@ -3843,8 +3794,6 @@ bool target_set(BIT_FLAGS mode)
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
-
-                                       /* Handle stuff */
                                        handle_stuff();
 
                                        /* Recalculate interesting grids */
@@ -3967,8 +3916,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 */
@@ -4510,8 +4457,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))
@@ -5121,8 +5066,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 */
@@ -5209,8 +5152,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;