[Refactor] #37353 player-item.c/hにref_item()を追加。

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

diff --git a/src/xtra1.c b/src/xtra1.c
index 2d5c6fe..dc24bca 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -1733,7 +1733,7 @@ static void fix_inven(void)
  * @return なし
  * </pre>
  */
-static void print_monster_line(int x, int y, monster_type* m_ptr, int n_same){
+static void print_monster_line(TERM_LEN x, TERM_LEN y, monster_type* m_ptr, int n_same){
        char buf[256];
        int i;
        MONRACE_IDX r_idx = m_ptr->ap_r_idx;
@@ -1780,8 +1780,8 @@ static void print_monster_line(int x, int y, monster_type* m_ptr, int n_same){
  * @param y 表示行
  * @param max_lines 最大何行描画するか
  */
-void print_monster_list(int x, int y, int max_lines){
-       int line = y;
+void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines){
+       TERM_LEN line = y;
        monster_type* last_mons = NULL;
        monster_type* m_ptr = NULL;
        int n_same = 0;
@@ -1986,14 +1986,14 @@ 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)
 {
        int j, i;
-       int w, h;
-       int x, y;
+       TERM_LEN w, h;
+       TERM_LEN x, y;
 
        /* Scan windows */
        for (j = 0; j < 8; j++)
@@ -2037,7 +2037,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.
@@ -2329,7 +2329,6 @@ static void calc_spells(void)
                                which = p_ptr->realm2;
                        }
 
-                       /* Message */
 #ifdef JP
                        msg_format("%sの%sを忘れてしまった。", do_spell(which, j%32, SPELL_NAME), p );
 #else
@@ -2387,7 +2386,6 @@ static void calc_spells(void)
                                which = p_ptr->realm2;
                        }
 
-                       /* Message */
 #ifdef JP
                        msg_format("%sの%sを忘れてしまった。",
                                   do_spell(which, j%32, SPELL_NAME), p );
@@ -2463,7 +2461,6 @@ static void calc_spells(void)
                                which = p_ptr->realm2;
                        }
 
-                       /* Message */
 #ifdef JP
                        msg_format("%sの%sを思い出した。", do_spell(which, j%32, SPELL_NAME), p );
 #else
@@ -2514,7 +2511,6 @@ static void calc_spells(void)
                /* Message if needed */
                if (p_ptr->new_spells)
                {
-                       /* Message */
 #ifdef JP
                        if( p_ptr->new_spells < 10 ){
                                msg_format("あと %d つの%sを学べる。", p_ptr->new_spells, p);
@@ -2606,7 +2602,7 @@ static void calc_mana(void)
        /* Only mages are affected */
        if (mp_ptr->spell_xtra & MAGIC_GLOVE_REDUCE_MANA)
        {
-               u32b flgs[TR_FLAG_SIZE];
+               BIT_FLAGS flgs[TR_FLAG_SIZE];
 
                /* Assume player is not encumbered by gloves */
                p_ptr->cumber_glove = FALSE;
@@ -2812,7 +2808,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);
        }
@@ -2824,7 +2819,6 @@ static void calc_mana(void)
        /* Take note when "glove state" changes */
        if (p_ptr->old_cumber_glove != p_ptr->cumber_glove)
        {
-               /* Message */
                if (p_ptr->cumber_glove)
                {
                        msg_print(_("手が覆われて呪文が唱えにくい感じがする。", "Your covered hands feel unsuitable for spellcasting."));
@@ -2842,7 +2836,6 @@ static void calc_mana(void)
        /* Take note when "armor state" changes */
        if (p_ptr->old_cumber_armor != p_ptr->cumber_armor)
        {
-               /* Message */
                if (p_ptr->cumber_armor)
                {
                        msg_print(_("装備の重さで動きが鈍くなってしまっている。", "The weight of your equipment encumbers your movement."));
@@ -2937,7 +2930,6 @@ static void calc_hitpoints(void)
                /* Display hitpoints (later) */
                p_ptr->redraw |= (PR_HP);
 
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
        }
 }
@@ -2952,7 +2944,7 @@ static void calc_torch(void)
 {
        int i, rad;
        object_type *o_ptr;
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        /* Assume no light */
        p_ptr->cur_lite = 0;
@@ -3010,7 +3002,6 @@ static void calc_torch(void)
        /* Notice changes in the "lite radius" */
        if (p_ptr->old_lite != p_ptr->cur_lite)
        {
-               /* Update stuff */
                /* Hack -- PU_MON_LITE for monsters' darkness */
                p_ptr->update |= (PU_LITE | PU_MON_LITE | PU_MONSTERS);
 
@@ -3112,7 +3103,7 @@ s16b calc_num_fire(object_type *o_ptr)
        int num = 0;
        OBJECT_TYPE_VALUE tval_ammo = bow_tval_ammo(o_ptr);
        object_type *q_ptr;
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
        
        /* Scan the usable inventory */
        for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
@@ -3213,7 +3204,7 @@ void calc_bonuses(void)
        int             empty_hands_status = empty_hands(TRUE);
        int             extra_blows[2];
        object_type     *o_ptr;
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
        bool            omoi = FALSE;
        bool            yoiyami = FALSE;
        bool            down_saving = FALSE;
@@ -3223,7 +3214,7 @@ void calc_bonuses(void)
        bool            have_sw = FALSE, have_kabe = FALSE;
        bool            easy_2weapon = FALSE;
        bool            riding_levitation = FALSE;
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
        const player_race *tmp_rp_ptr;
 
        /* Save the old vision stuff */
@@ -4524,7 +4515,7 @@ void calc_bonuses(void)
                }
                for (i = INVEN_RARM; i <= INVEN_FEET; i++)
                {
-                       int ac = 0;
+                       ARMOUR_CLASS ac = 0;
                        o_ptr = &inventory[i];
                        if (!o_ptr->k_idx) continue;
                        if (!object_is_armour(o_ptr)) continue;
@@ -4554,7 +4545,6 @@ void calc_bonuses(void)
                        /* Redisplay the stats later */
                        p_ptr->redraw |= (PR_STATS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
 
@@ -4580,7 +4570,6 @@ void calc_bonuses(void)
                        /* Redisplay the stats later */
                        p_ptr->redraw |= (PR_STATS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
 
@@ -4633,7 +4622,6 @@ void calc_bonuses(void)
                                }
                        }
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
        }
@@ -4934,7 +4922,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 */
@@ -5483,7 +5471,6 @@ void calc_bonuses(void)
                /* Redraw */
                p_ptr->redraw |= (PR_ARMOR);
 
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
        }
 
@@ -5619,7 +5606,6 @@ void calc_bonuses(void)
        /* Take note when "heavy bow" changes */
        if (p_ptr->old_heavy_shoot != p_ptr->heavy_shoot)
        {
-               /* Message */
                if (p_ptr->heavy_shoot)
                {
                        msg_print(_("こんな重い弓を装備しているのは大変だ。", "You have trouble wielding such a heavy bow."));
@@ -5642,7 +5628,6 @@ void calc_bonuses(void)
                /* Take note when "heavy weapon" changes */
                if (p_ptr->old_heavy_wield[i] != p_ptr->heavy_wield[i])
                {
-                       /* Message */
                        if (p_ptr->heavy_wield[i])
                        {
                                msg_print(_("こんな重い武器を装備しているのは大変だ。", "You have trouble wielding such a heavy weapon."));
@@ -5667,7 +5652,6 @@ void calc_bonuses(void)
                /* Take note when "heavy weapon" changes */
                if (p_ptr->old_riding_wield[i] != p_ptr->riding_wield[i])
                {
-                       /* Message */
                        if (p_ptr->riding_wield[i])
                        {
                                msg_print(_("この武器は乗馬中に使うにはむかないようだ。", "This weapon is not suitable for use while riding."));
@@ -5687,7 +5671,6 @@ void calc_bonuses(void)
                /* Take note when "illegal weapon" changes */
                if (p_ptr->old_icky_wield[i] != p_ptr->icky_wield[i])
                {
-                       /* Message */
                        if (p_ptr->icky_wield[i])
                        {
                                msg_print(_("今の装備はどうも自分にふさわしくない気がする。", "You do not feel comfortable with your weapon."));
@@ -5712,7 +5695,6 @@ void calc_bonuses(void)
 
        if (p_ptr->riding && (p_ptr->old_riding_ryoute != p_ptr->riding_ryoute))
        {
-               /* Message */
                if (p_ptr->riding_ryoute)
                {
 #ifdef JP
@@ -5847,7 +5829,6 @@ void notice_stuff(void)
  */
 void update_stuff(void)
 {
-       /* Update stuff */
        if (!p_ptr->update) return;
 
 
@@ -6258,13 +6239,11 @@ void window_stuff(void)
  */
 void handle_stuff(void)
 {
-       /* Update stuff */
        if (p_ptr->update) update_stuff();
 
        /* Redraw stuff */
        if (p_ptr->redraw) redraw_stuff();
 
-       /* Window stuff */
        if (p_ptr->window) window_stuff();
 }