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

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

diff --git a/src/xtra1.c b/src/xtra1.c
index a7cfd39..1ef756d 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -1707,8 +1707,6 @@ static void fix_inven(void)
 
                /* Display inventory */
                display_inven();
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -1866,8 +1864,6 @@ static void fix_monster_list(void)
 
                target_set_prepare_look();//モンスター一覧を生成，ソート
                print_monster_list(0, 0, h);
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -1902,8 +1898,6 @@ static void fix_equip(void)
 
                /* Display equipment */
                display_equip();
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -1937,8 +1931,6 @@ static void fix_spell(void)
 
                /* Display spell list */
                display_spell_list();
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -1974,8 +1966,6 @@ static void fix_player(void)
 
                /* Display player */
                display_player(0);
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -1986,7 +1976,7 @@ static void fix_player(void)
 /*!
  * @brief ゲームメッセージ履歴をサブウィンドウに表示する / 
  * Hack -- display recent messages in sub-windows
- * XXX XXX XXX Adjust for width and split messages
+ * Adjust for width and split messages
  * @return なし
  */
 static void fix_message(void)
@@ -2009,7 +1999,6 @@ static void fix_message(void)
                /* Activate */
                Term_activate(angband_term[j]);
 
-               /* Get size */
                Term_get_size(&w, &h);
 
                /* Dump messages */
@@ -2024,8 +2013,6 @@ static void fix_message(void)
                        /* Clear to end of line */
                        Term_erase(x, y, 255);
                }
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -2037,7 +2024,7 @@ static void fix_message(void)
 /*!
  * @brief 簡易マップをサブウィンドウに表示する / 
  * Hack -- display overhead view in sub-windows
- * XXX XXX XXX Adjust for width and split messages
+ * Adjust for width and split messages
  * @return なし
  * @details
  * Note that the "player" symbol does NOT appear on the map.
@@ -2045,7 +2032,6 @@ static void fix_message(void)
 static void fix_overhead(void)
 {
        int j;
-
        int cy, cx;
 
        /* Scan windows */
@@ -2067,10 +2053,8 @@ static void fix_overhead(void)
                Term_get_size(&wid, &hgt);
                if (wid > COL_MAP + 2 && hgt > ROW_MAP + 2)
                {
-                       /* Redraw map */
-                       display_map(&cy, &cx);
 
-                       /* Fresh */
+                       display_map(&cy, &cx);
                        Term_fresh();
                }
 
@@ -2105,8 +2089,6 @@ static void fix_dungeon(void)
 
                /* Redraw dungeon view */
                display_dungeon();
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -2140,8 +2122,6 @@ static void fix_monster(void)
 
                /* Display monster race info */
                if (p_ptr->monster_race_idx) display_roff(p_ptr->monster_race_idx);
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -2175,8 +2155,6 @@ static void fix_object(void)
 
                /* Display monster race info */
                if (p_ptr->object_kind_idx) display_koff(p_ptr->object_kind_idx);
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -2808,7 +2786,6 @@ static void calc_mana(void)
                /* Display mana later */
                p_ptr->redraw |= (PR_MANA);
 
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
                p_ptr->window |= (PW_SPELL);
        }
@@ -2931,7 +2908,6 @@ static void calc_hitpoints(void)
                /* Display hitpoints (later) */
                p_ptr->redraw |= (PR_HP);
 
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
        }
 }
@@ -4547,7 +4523,6 @@ void calc_bonuses(void)
                        /* Redisplay the stats later */
                        p_ptr->redraw |= (PR_STATS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
 
@@ -4573,7 +4548,6 @@ void calc_bonuses(void)
                        /* Redisplay the stats later */
                        p_ptr->redraw |= (PR_STATS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
 
@@ -4626,7 +4600,6 @@ void calc_bonuses(void)
                                }
                        }
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
        }
@@ -4901,7 +4874,7 @@ void calc_bonuses(void)
        {
                monster_type *riding_m_ptr = &m_list[p_ptr->riding];
                monster_race *riding_r_ptr = &r_info[riding_m_ptr->r_idx];
-               int speed = riding_m_ptr->mspeed;
+               SPEED speed = riding_m_ptr->mspeed;
 
                if (riding_m_ptr->mspeed > 110)
                {
@@ -4927,7 +4900,7 @@ void calc_bonuses(void)
                i = 1500 + riding_r_ptr->level * 25;
        }
 
-       /* XXX XXX XXX Apply "encumbrance" from weight */
+       /* Apply "encumbrance" from weight */
        if (j > i) new_speed -= ((j - i) / (i / 5));
 
        /* Searching slows the player down */
@@ -5010,7 +4983,11 @@ void calc_bonuses(void)
                p_ptr->icky_wield[i] = FALSE;
                p_ptr->riding_wield[i] = FALSE;
 
-               if (!buki_motteruka(INVEN_RARM+i)) {p_ptr->num_blow[i]=1;continue;}
+               if (!buki_motteruka(INVEN_RARM+i))
+               {
+                       p_ptr->num_blow[i] = 1;
+                       continue;
+               }
                /* It is hard to hold a heavy weapon */
                if (hold < o_ptr->weight / 10)
                {
@@ -5473,14 +5450,10 @@ void calc_bonuses(void)
        /* Redraw armor (if needed) */
        if ((p_ptr->dis_ac != old_dis_ac) || (p_ptr->dis_to_a != old_dis_to_a))
        {
-               /* Redraw */
                p_ptr->redraw |= (PR_ARMOR);
-
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
        }
 
-
        if (p_ptr->ryoute && !omoi)
        {
                int bonus_to_h=0, bonus_to_d=0;
@@ -6250,7 +6223,6 @@ void handle_stuff(void)
        /* Redraw stuff */
        if (p_ptr->redraw) redraw_stuff();
 
-       /* Window stuff */
        if (p_ptr->window) window_stuff();
 }