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

diff --git a/src/bldg.c b/src/bldg.c
index f8d9975..e4418cc 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4037,8 +4037,6 @@ static bool research_mon(void)
 
                                /* Save this monster ID */
                                monster_race_track(r_idx);
-
-                               /* Hack -- Handle stuff */
                                handle_stuff();
 
                                /* know every thing mode */
@@ -4492,10 +4490,8 @@ void do_cmd_bldg(void)
                        }
                }
 
-               if (validcmd)
-                       bldg_process_command(bldg, i);
+               if(validcmd) bldg_process_command(bldg, i);
 
-               /* Notice stuff */
                notice_stuff();
                handle_stuff();
        }

diff --git a/src/cmd-item.c b/src/cmd-item.c
index e594485..da56f8b 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -1841,8 +1841,6 @@ void do_cmd_query_symbol(void)
 
                /* Hack -- Auto-recall */
                monster_race_track(r_idx);
-
-               /* Hack -- Handle stuff */
                handle_stuff();
 
                /* Interact */

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 7fe524c..7dfd6ff 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -208,8 +208,6 @@ void do_cmd_pet_dismiss(void)
                {
                        /* Hack -- health bar for this monster */
                        health_track(pet_ctr);
-
-                       /* Hack -- handle stuff */
                        handle_stuff();
 
                        msg_format(_("%sを放しますか？ [Yes/No/Unnamed (%d体)]", "Dismiss %s? [Yes/No/Unnamed (%d remain)]"), friend_name, max_pet - i);

diff --git a/src/cmd2.c b/src/cmd2.c
index 24bf087..bafddf7 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -2846,8 +2846,6 @@ void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr)
        }
 
        sound(SOUND_SHOOT);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        /* Save the old location */
@@ -3528,8 +3526,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
        y = p_ptr->y;
        x = p_ptr->x;
 
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        if ((p_ptr->pclass == CLASS_NINJA) && ((q_ptr->tval == TV_SPIKE) || ((have_flag(flgs, TR_THROW)) && (q_ptr->tval == TV_SWORD)))) shuriken = TRUE;

diff --git a/src/cmd4.c b/src/cmd4.c
index f1c4c34..460a0cb 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -6786,8 +6786,6 @@ static void do_cmd_knowledge_monsters(bool *need_redraw, bool visual_only, IDX d
                {
                        /* Mega Hack -- track this monster race */
                        if (mon_cnt) monster_race_track(mon_idx[mon_cur]);
-
-                       /* Hack -- handle stuff */
                        handle_stuff();
                }
 
@@ -6962,8 +6960,6 @@ static void desc_obj_fake(KIND_OBJECT_IDX k_idx)
 
        /* Hack - mark as fake */
        /* term_obj_real = FALSE; */
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        if (!screen_object(o_ptr, SCROBJ_FAKE_OBJECT | SCROBJ_FORCE_DETAIL))
@@ -7191,7 +7187,6 @@ static void do_cmd_knowledge_objects(bool *need_redraw, bool visual_only, IDX di
                        /* The "current" object changed */
                        if (object_old != object_idx[object_cur])
                        {
-                               /* Hack -- handle stuff */
                                handle_stuff();
 
                                /* Remember the "current" object */

diff --git a/src/cmd5.c b/src/cmd5.c
index d8f509f..fcee3f1 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -514,8 +514,6 @@ void do_cmd_browse(void)
 
        /* Track the object kind */
        object_kind_track(o_ptr->k_idx);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
 
@@ -721,8 +719,6 @@ void do_cmd_study(void)
 
        /* Track the object kind */
        object_kind_track(o_ptr->k_idx);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        /* Mage -- Learn a selected spell */
@@ -1003,8 +999,6 @@ void do_cmd_cast(void)
 
        /* Track the object kind */
        object_kind_track(o_ptr->k_idx);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        if ((p_ptr->pclass == CLASS_SORCERER) || (p_ptr->pclass == CLASS_RED_MAGE))

diff --git a/src/monster-status.c b/src/monster-status.c
index a99a4d8..35da7f4 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -710,7 +710,6 @@ bool process_the_world(int num, MONSTER_IDX who, bool vs_player)
 
                reset_target(m_ptr);
 
-               /* Notice stuff */
                if (p_ptr->notice) notice_stuff();
                if (p_ptr->update) update_stuff();
                if (p_ptr->redraw) redraw_stuff();

diff --git a/src/spells1.c b/src/spells1.c
index 1d267ed..c75b46c 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -6858,8 +6858,6 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        /* Calculate the projection path */
 
        path_n = project_path(path_g, (project_length ? project_length : MAX_RANGE), y1, x1, y2, x2, flg);
-
-       /* Hack -- Handle stuff */
        handle_stuff();
 
        /* Giga-Hack SEEKER & SUPER_RAY */

diff --git a/src/store.c b/src/store.c
index 98aa6e4..bfc4261 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -4947,7 +4947,6 @@ void do_cmd_store(void)
                /* Hack -- Character is still in "icky" mode */
                character_icky = TRUE;
 
-               /* Notice stuff */
                notice_stuff();
                handle_stuff();
 

diff --git a/src/xtra1.c b/src/xtra1.c
index e09c9f2..7c70cc5 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -5750,12 +5750,10 @@ void calc_bonuses(void)
  */
 void notice_stuff(void)
 {
-       /* Notice stuff */
-       if (!p_ptr->notice) return;
-
+       if(!p_ptr->notice) return;
 
        /* Actually do auto-destroy */
-       if (p_ptr->notice & (PN_AUTODESTROY))
+       if(p_ptr->notice & (PN_AUTODESTROY))
        {
                p_ptr->notice &= ~(PN_AUTODESTROY);
                autopick_delayed_alter();
@@ -5786,7 +5784,6 @@ void update_stuff(void)
 {
        if (!p_ptr->update) return;
 
-
        if (p_ptr->update & (PU_BONUS))
        {
                p_ptr->update &= ~(PU_BONUS);
@@ -5817,15 +5814,12 @@ void update_stuff(void)
                calc_spells();
        }
 
-
        /* Character is not ready yet, no screen updates */
        if (!character_generated) return;
 
-
        /* Character is in "icky" mode, no screen updates */
        if (character_icky) return;
 
-
        if (p_ptr->update & (PU_UN_LITE))
        {
                p_ptr->update &= ~(PU_UN_LITE);
@@ -5914,14 +5908,12 @@ void redraw_stuff(void)
                Term_clear();
        }
 
-
        if (p_ptr->redraw & (PR_MAP))
        {
                p_ptr->redraw &= ~(PR_MAP);
                prt_map();
        }
 
-
        if (p_ptr->redraw & (PR_BASIC))
        {
                p_ptr->redraw &= ~(PR_BASIC);
@@ -5945,7 +5937,6 @@ void redraw_stuff(void)
                p_ptr->redraw &= ~(PR_MISC);
                prt_field(rp_ptr->title, ROW_RACE, COL_RACE);
 /*             prt_field(cp_ptr->title, ROW_CLASS, COL_CLASS); */
-
        }
 
        if (p_ptr->redraw & (PR_TITLE))
@@ -6025,7 +6016,6 @@ void redraw_stuff(void)
                health_redraw(TRUE);
        }
 
-
        if (p_ptr->redraw & (PR_EXTRA))
        {
                p_ptr->redraw &= ~(PR_EXTRA);
@@ -6080,7 +6070,6 @@ void redraw_stuff(void)
        }
 }
 
-
 /*! 
  * @brief p_ptr->window のフラグに応じた更新をまとめて行う / Handle "p_ptr->window"
  * @return なし
@@ -6089,7 +6078,6 @@ void redraw_stuff(void)
 void window_stuff(void)
 {
        int j;
-
        BIT_FLAGS mask = 0L;
 
        /* Nothing to do */

diff --git a/src/xtra2.c b/src/xtra2.c
index bb0e76c..8f5b8dd 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2951,8 +2951,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 */