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

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

diff --git a/src/xtra2.c b/src/xtra2.c
index f0ee49c..bdc7f4c 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -648,8 +648,6 @@ void check_quest_completion(monster_type *m_ptr)
                {
                        /* Get local object */
                        o_ptr = &forge;
-
-                       /* Wipe the object */
                        object_wipe(o_ptr);
 
                        /* Make a great object */
@@ -953,8 +951,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                {
                        /* Get local object */
                        q_ptr = &forge;
-
-                       /* Wipe the object */
                        object_wipe(q_ptr);
 
                        /* Activate restriction */
@@ -1138,8 +1134,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
-
-                               /* Wipe the object */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */
@@ -1158,8 +1152,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
-
-                               /* Wipe the object */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */
@@ -1178,8 +1170,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
-
-                               /* Wipe the object */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */
@@ -1198,8 +1188,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
-
-                               /* Wipe the object */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */
@@ -1218,8 +1206,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                /* Get local object */
                                q_ptr = &forge;
-
-                               /* Wipe the object */
                                object_wipe(q_ptr);
 
                                /* Activate restriction */
@@ -1340,8 +1326,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        {
                /* Get local object */
                q_ptr = &forge;
-
-               /* Wipe the object */
                object_wipe(q_ptr);
 
                /* Make Gold */
@@ -2037,7 +2021,6 @@ void panel_bounds_center(void)
 {
        int wid, hgt;
 
-       /* Get size */
        get_screen_size(&wid, &hgt);
 
        panel_row_max = panel_row_min + hgt - 1;
@@ -2083,8 +2066,6 @@ void resize_map(void)
 
        /* Hack -- update */
        handle_stuff();
-       
-       /* Redraw */
        Term_redraw();
 
        /*
@@ -2108,13 +2089,10 @@ void redraw_window(void)
        if (!character_dungeon) return;
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
-
        p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
 
        /* Hack -- update */
        handle_stuff();
-
-       /* Redraw */
        Term_redraw();
 }
 
@@ -2133,7 +2111,6 @@ bool change_panel(POSITION dy, POSITION dx)
        POSITION y, x;
        TERM_LEN wid, hgt;
 
-       /* Get size */
        get_screen_size(&wid, &hgt);
 
        /* Apply the motion */
@@ -2160,7 +2137,6 @@ bool change_panel(POSITION dy, POSITION dx)
 
                p_ptr->update |= (PU_MONSTERS);
 
-               /* Redraw map */
                p_ptr->redraw |= (PR_MAP);
 
                /* Handle stuff */
@@ -2189,7 +2165,6 @@ static bool change_panel_xy(POSITION y, POSITION x)
        POSITION dy = 0, dx = 0;
        TERM_LEN wid, hgt;
 
-       /* Get size */
        get_screen_size(&wid, &hgt);
 
        if (y < panel_row_min) dy = -1;
@@ -2223,7 +2198,6 @@ void verify_panel(void)
        int max_prow_min;
        int max_pcol_min;
 
-       /* Get size */
        get_screen_size(&wid, &hgt);
 
        max_prow_min = cur_hgt - hgt;
@@ -2300,14 +2274,13 @@ void verify_panel(void)
        panel_col_min = pcol_min;
 
        /* Hack -- optional disturb on "panel change" */
-       if (disturb_panel && !center_player) disturb(0, 0);
+       if (disturb_panel && !center_player) disturb(FALSE, FALSE);
 
        /* Recalculate the boundaries */
        panel_bounds_center();
 
        p_ptr->update |= (PU_MONSTERS);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -2740,8 +2713,6 @@ static POSITION_IDX target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION
                /* Track best */
                b_i = i; b_v = v;
        }
-
-       /* Result */
        return (b_i);
 }
 
@@ -2981,8 +2952,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
        feature_type *f_ptr;
        char query = '\001';
        char out_val[MAX_NLEN+80];
-
-#ifdef ALLOW_EASY_FLOOR
        OBJECT_IDX floor_list[23];
        ITEM_NUMBER floor_num = 0;
 
@@ -2997,8 +2966,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                }
        }
 
-#endif /* ALLOW_EASY_FLOOR */
-
        /* Hack -- under the player */
        if (player_bold(y, x))
        {
@@ -3163,7 +3130,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                        /* Obtain an object description */
                        object_desc(o_name, o_ptr, 0);
 
-                       /* Describe the object */
 #ifdef JP
                        sprintf(out_val, "%s%s%s%s[%s]", s1, o_name, s2, s3, info);
 #else
@@ -3193,8 +3159,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 #endif
        }
 
-
-#ifdef ALLOW_EASY_FLOOR
        if (floor_num)
        {
                int min_width = 0;
@@ -3210,15 +3174,12 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                                /* Acquire object */
                                o_ptr = &o_list[floor_list[0]];
 
-                               /* Describe the object */
                                object_desc(o_name, o_ptr, 0);
 
 #ifdef JP
-                               sprintf(out_val, "%s%s%s%s[%s]",
-                                       s1, o_name, s2, s3, info);
+                               sprintf(out_val, "%s%s%s%s[%s]", s1, o_name, s2, s3, info);
 #else
-                               sprintf(out_val, "%s%s%s%s [%s]",
-                                       s1, s2, s3, o_name, info);
+                               sprintf(out_val, "%s%s%s%s [%s]", s1, s2, s3, o_name, info);
 #endif
 
                                prt(out_val, 0, 0);
@@ -3316,8 +3277,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 
                /* NOTREACHED */
        }
-#endif /* ALLOW_EASY_FLOOR */
-
 
        /* Scan all objects in the grid */
        for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
@@ -3341,7 +3300,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
                        /* Obtain an object description */
                        object_desc(o_name, o_ptr, 0);
 
-                       /* Describe the object */
 #ifdef JP
                        sprintf(out_val, "%s%s%s%s[%s]", s1, o_name, s2, s3, info);
 #else
@@ -3522,7 +3480,7 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
  * some form of "scrolling" the map around the cursor.  
  * That is, consider the possibility of "auto-scrolling" the screen
  * while the cursor moves around.  This may require changes in the
- * "update_mon()" code to allow "visibility" even if off panel, and
+ * "update_monster()" code to allow "visibility" even if off panel, and
  * may require dynamic recalculation of the "temp" grid set.
  *
  * Hack -- targeting/observing an "outer border grid" may induce
@@ -3569,7 +3527,6 @@ bool target_set(BIT_FLAGS mode)
 
        int wid, hgt;
        
-       /* Get size */
        get_screen_size(&wid, &hgt);
 
        /* Cancel target */
@@ -3708,7 +3665,6 @@ bool target_set(BIT_FLAGS mode)
 
                                        p_ptr->update |= (PU_MONSTERS);
 
-                                       /* Redraw map */
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
@@ -3799,7 +3755,6 @@ bool target_set(BIT_FLAGS mode)
 
                                                p_ptr->update |= (PU_MONSTERS);
 
-                                               /* Redraw map */
                                                p_ptr->redraw |= (PR_MAP);
 
                                                p_ptr->window |= (PW_OVERHEAD);
@@ -3918,7 +3873,6 @@ bool target_set(BIT_FLAGS mode)
 
                                        p_ptr->update |= (PU_MONSTERS);
 
-                                       /* Redraw map */
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
@@ -4043,7 +3997,6 @@ bool target_set(BIT_FLAGS mode)
 
        p_ptr->update |= (PU_MONSTERS);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD);
@@ -5129,7 +5082,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
 
        int wid, hgt;
 
-       /* Get size */
        get_screen_size(&wid, &hgt);
 
        x = p_ptr->x;
@@ -5199,7 +5151,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
 
                                        p_ptr->update |= (PU_MONSTERS);
 
-                                       /* Redraw map */
                                        p_ptr->redraw |= (PR_MAP);
 
                                        p_ptr->window |= (PW_OVERHEAD);
@@ -5288,7 +5239,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
 
        p_ptr->update |= (PU_MONSTERS);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD);