OSDN Git Service

[Refactor] #37353 コメント整理 / Refactor comments.
[hengband/hengband.git] / src / xtra1.c
index 8c44f6b..55b12e8 100644 (file)
@@ -1,7 +1,7 @@
 /*!
  * @file xtra1.c
- * @brief 雑多なその他の処理1 / misc code
- * @date 2014/08/17
+ * @brief プレイヤーのステータス処理 / status
+ * @date 2018/09/25
  * @author
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke\n
  * This software may be copied and distributed for educational, research, and\n
@@ -96,7 +96,7 @@ s16b modify_stat_value(int value, int amount)
        }
 
        /* Return new value */
-       return (value);
+       return (s16b)(value);
 }
 
 
@@ -674,10 +674,10 @@ static void prt_status(void)
                        hex_spelling(HEX_CURE_SERIOUS) ||
                        hex_spelling(HEX_CURE_CRITICAL)) ADD_FLG(BAR_CURE);
 
-               if (p_ptr->magic_num2[2])
+               if (HEX_REVENGE_TURN(p_ptr))
                {
-                       if (p_ptr->magic_num2[1] == 1) ADD_FLG(BAR_PATIENCE);
-                       if (p_ptr->magic_num2[1] == 2) ADD_FLG(BAR_REVENGE);
+                       if (HEX_REVENGE_TYPE(p_ptr) == 1) ADD_FLG(BAR_PATIENCE);
+                       if (HEX_REVENGE_TYPE(p_ptr) == 2) ADD_FLG(BAR_REVENGE);
                }
        }
 
@@ -1030,8 +1030,8 @@ static void prt_depth(void)
        }
        else
        {
-               if (depth_in_feet) (void)sprintf(depths, _("%d ft", "%d ft"), dun_level * 50);
-               else (void)sprintf(depths, _("%d 階", "Lev %d"), dun_level);
+               if (depth_in_feet) (void)sprintf(depths, _("%d ft", "%d ft"), (int)dun_level * 50);
+               else (void)sprintf(depths, _("%d 階", "Lev %d"), (int)dun_level);
 
                /* Get color of level based on feeling  -JSV- */
                switch (p_ptr->feeling)
@@ -1113,7 +1113,7 @@ static void prt_state(void)
 {
        byte attr = TERM_WHITE;
 
-       char text[5];
+       char text[16];
 
        /* Repeating */
        if (command_rep)
@@ -1181,13 +1181,13 @@ static void prt_state(void)
                                }
 
                                /* Rest until healed */
-                               else if (resting == -1)
+                               else if (resting == COMMAND_ARG_REST_FULL_HEALING)
                                {
                                        text[0] = text[1] = text[2] = text[3] = '*';
                                }
 
                                /* Rest until done */
-                               else if (resting == -2)
+                               else if (resting == COMMAND_ARG_REST_UNTIL_DONE)
                                {
                                        text[0] = text[1] = text[2] = text[3] = '&';
                                }
@@ -1707,8 +1707,6 @@ static void fix_inven(void)
 
                /* Display inventory */
                display_inven();
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -1733,10 +1731,10 @@ 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;
-       int r_idx = m_ptr->ap_r_idx;
+       MONRACE_IDX r_idx = m_ptr->ap_r_idx;
        monster_race* r_ptr = &r_info[r_idx];
  
        Term_gotoxy(x, y);
@@ -1762,7 +1760,7 @@ static void print_monster_line(int x, int y, monster_type* m_ptr, int n_same){
        Term_add_bigch(r_ptr->x_attr, r_ptr->x_char);
        //LV
        if (r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG2_KAGE)){
-               sprintf(buf, " %2d", r_ptr->level);
+               sprintf(buf, " %2d", (int)r_ptr->level);
        }else{
                strcpy(buf, " ??");
        }
@@ -1780,8 +1778,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;
@@ -1795,7 +1793,7 @@ void print_monster_list(int x, int y, int max_lines){
                if(!m_ptr->r_idx)continue;//dead?
                {
                        /*
-                       int r_idx = m_ptr->ap_r_idx;
+                       MONRACE_IDX r_idx = m_ptr->ap_r_idx;
                        monster_race* r_ptr = &r_info[r_idx];
                        cptr name = (r_name + r_ptr->name);
                        cptr ename = (r_name + r_ptr->name);
@@ -1864,10 +1862,8 @@ static void fix_monster_list(void)
 
                Term_clear();
 
-               target_set_prepare_look(); //モンスター一覧を生成,ソート
+               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,14 +1976,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++)
@@ -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.
@@ -2069,8 +2056,6 @@ static void fix_overhead(void)
                {
                        /* Redraw map */
                        display_map(&cy, &cx);
-
-                       /* Fresh */
                        Term_fresh();
                }
 
@@ -2105,8 +2090,6 @@ static void fix_dungeon(void)
 
                /* Redraw dungeon view */
                display_dungeon();
-
-               /* Fresh */
                Term_fresh();
 
                /* Restore */
@@ -2140,8 +2123,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 +2156,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 */
@@ -2197,12 +2176,12 @@ static void fix_object(void)
  */
 static void calc_spells(void)
 {
-       int                     i, j, k, levels;
-       int                     num_allowed;
-       int         num_boukyaku = 0;
+       int i, j, k, levels;
+       int num_allowed;
+       int num_boukyaku = 0;
 
        const magic_type        *s_ptr;
-       int which;
+       REALM_IDX which;
        int bonus = 0;
 
 
@@ -2329,13 +2308,10 @@ static void calc_spells(void)
                                which = p_ptr->realm2;
                        }
 
-                       /* Message */
 #ifdef JP
-                       msg_format("%sの%sを忘れてしまった。",
-                                  do_spell(which, j%32, SPELL_NAME), p );
+                       msg_format("%sの%sを忘れてしまった。", do_spell(which, j%32, SPELL_NAME), p );
 #else
-                       msg_format("You have forgotten the %s of %s.", p,
-                       do_spell(which, j%32, SPELL_NAME));
+                       msg_format("You have forgotten the %s of %s.", p, do_spell(which, j%32, SPELL_NAME));
 #endif
 
 
@@ -2389,7 +2365,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 );
@@ -2465,13 +2440,10 @@ static void calc_spells(void)
                                which = p_ptr->realm2;
                        }
 
-                       /* Message */
 #ifdef JP
-                       msg_format("%sの%sを思い出した。",
-                                  do_spell(which, j%32, SPELL_NAME), p );
+                       msg_format("%sの%sを思い出した。", do_spell(which, j%32, SPELL_NAME), p );
 #else
-                       msg_format("You have remembered the %s of %s.",
-                                  p, do_spell(which, j%32, SPELL_NAME));
+                       msg_format("You have remembered the %s of %s.", p, do_spell(which, j%32, SPELL_NAME));
 #endif
 
 
@@ -2503,7 +2475,11 @@ static void calc_spells(void)
                        k++;
                }
                if (k > 32) k = 32;
-               if ((p_ptr->new_spells > k) && ((mp_ptr->spell_book == TV_LIFE_BOOK) || (mp_ptr->spell_book == TV_HISSATSU_BOOK))) p_ptr->new_spells = k;
+               if ((p_ptr->new_spells > k) &&
+                       ((mp_ptr->spell_book == TV_LIFE_BOOK) || (mp_ptr->spell_book == TV_HISSATSU_BOOK)))
+               {
+                       p_ptr->new_spells = (s16b)k;
+               }
        }
 
        if (p_ptr->new_spells < 0) p_ptr->new_spells = 0;
@@ -2514,7 +2490,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);
@@ -2550,7 +2525,7 @@ static void calc_spells(void)
  */
 static void calc_mana(void)
 {
-       int             msp, levels, cur_wgt, max_wgt;
+       int msp, levels, cur_wgt, max_wgt;
 
        object_type     *o_ptr;
 
@@ -2606,7 +2581,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;
@@ -2803,8 +2778,7 @@ static void calc_mana(void)
                /* レベルアップの時は上昇量を表示する */
                if ((level_up == 1) && (msp > p_ptr->msp))
                {
-                       msg_format("最大マジック・ポイントが %d 増加した!",
-                                  (msp - p_ptr->msp));
+                       msg_format("最大マジック・ポイントが %d 増加した!", (msp - p_ptr->msp));
                }
 #endif
                /* Save new mana */
@@ -2813,7 +2787,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);
        }
@@ -2825,7 +2798,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."));
@@ -2843,7 +2815,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."));
@@ -2929,8 +2900,7 @@ static void calc_hitpoints(void)
                /* レベルアップの時は上昇量を表示する */
                if ((level_up == 1) && (mhp > p_ptr->mhp))
                {
-                       msg_format("最大ヒット・ポイントが %d 増加した!",
-                                  (mhp - p_ptr->mhp) );
+                       msg_format("最大ヒット・ポイントが %d 増加した!", (mhp - p_ptr->mhp) );
                }
 #endif
                /* Save the new max-hitpoints */
@@ -2939,7 +2909,6 @@ static void calc_hitpoints(void)
                /* Display hitpoints (later) */
                p_ptr->redraw |= (PR_HP);
 
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
        }
 }
@@ -2954,7 +2923,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;
@@ -2990,7 +2959,7 @@ static void calc_torch(void)
                if (have_flag(flgs, TR_LITE_M1)) rad -= 1;
                if (have_flag(flgs, TR_LITE_M2)) rad -= 2;
                if (have_flag(flgs, TR_LITE_M3)) rad -= 3;
-               p_ptr->cur_lite += rad;
+               p_ptr->cur_lite += (s16b)rad;
        }
 
        /* max radius is 14 (was 5) without rewriting other code -- */
@@ -3012,7 +2981,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);
 
@@ -3030,12 +2998,12 @@ static void calc_torch(void)
  * Computes current weight limit.
  * @return 制限重量(ポンド)
  */
-u32b weight_limit(void)
+WEIGHT weight_limit(void)
 {
-       u32b i;
+       WEIGHT i;
 
        /* Weight limit based only on strength */
-       i = (u32b)adj_str_wgt[p_ptr->stat_ind[A_STR]] * 50; /* Constant was 100 */
+       i = (WEIGHT)adj_str_wgt[p_ptr->stat_ind[A_STR]] * 50; /* Constant was 100 */
        if (p_ptr->pclass == CLASS_BERSERKER) i = i * 3 / 2;
 
        /* Return the result */
@@ -3112,9 +3080,9 @@ s16b calc_num_fire(object_type *o_ptr)
        int extra_shots = 0;
        int i;
        int num = 0;
-       int tval_ammo = bow_tval_ammo(o_ptr);
+       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++)
@@ -3180,7 +3148,7 @@ s16b calc_num_fire(object_type *o_ptr)
                        num += (p_ptr->lev * 4);
                }
        }
-       return num;
+       return (s16b)num;
 }
 
 /*!
@@ -3215,7 +3183,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;
@@ -3225,7 +3193,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 */
@@ -3246,8 +3214,8 @@ void calc_bonuses(void)
        bool old_mighty_throw = p_ptr->mighty_throw;
 
        /* Save the old armor class */
-       bool old_dis_ac = p_ptr->dis_ac;
-       bool old_dis_to_a = p_ptr->dis_to_a;
+       s16b old_dis_ac = p_ptr->dis_ac;
+       s16b old_dis_to_a = p_ptr->dis_to_a;
 
 
        /* Clear extra blows/shots */
@@ -4358,25 +4326,25 @@ void calc_bonuses(void)
                /* To Bow and Natural attack */
 
                /* Apply the bonuses to hit/damage */
-               p_ptr->to_h_b += bonus_to_h;
-               p_ptr->to_h_m += bonus_to_h;
-               p_ptr->to_d_m += bonus_to_d;
+               p_ptr->to_h_b += (s16b)bonus_to_h;
+               p_ptr->to_h_m += (s16b)bonus_to_h;
+               p_ptr->to_d_m += (s16b)bonus_to_d;
 
                /* Apply the mental bonuses tp hit/damage, if known */
-               if (object_is_known(o_ptr)) p_ptr->dis_to_h_b += bonus_to_h;
+               if (object_is_known(o_ptr)) p_ptr->dis_to_h_b += (s16b)bonus_to_h;
 
                /* To Melee */
                if ((i == INVEN_LEFT || i == INVEN_RIGHT) && !p_ptr->ryoute)
                {
                        /* Apply the bonuses to hit/damage */
-                       p_ptr->to_h[i-INVEN_RIGHT] += bonus_to_h;
-                       p_ptr->to_d[i-INVEN_RIGHT] += bonus_to_d;
+                       p_ptr->to_h[i-INVEN_RIGHT] += (s16b)bonus_to_h;
+                       p_ptr->to_d[i-INVEN_RIGHT] += (s16b)bonus_to_d;
 
                        /* Apply the mental bonuses tp hit/damage, if known */
                        if (object_is_known(o_ptr))
                        {
-                               p_ptr->dis_to_h[i-INVEN_RIGHT] += bonus_to_h;
-                               p_ptr->dis_to_d[i-INVEN_RIGHT] += bonus_to_d;
+                               p_ptr->dis_to_h[i-INVEN_RIGHT] += (s16b)bonus_to_h;
+                               p_ptr->dis_to_d[i-INVEN_RIGHT] += (s16b)bonus_to_d;
                        }
                }
                else if (p_ptr->migite && p_ptr->hidarite)
@@ -4399,14 +4367,14 @@ void calc_bonuses(void)
                else
                {
                        /* Apply the bonuses to hit/damage */
-                       p_ptr->to_h[default_hand] += bonus_to_h;
-                       p_ptr->to_d[default_hand] += bonus_to_d;
+                       p_ptr->to_h[default_hand] += (s16b)bonus_to_h;
+                       p_ptr->to_d[default_hand] += (s16b)bonus_to_d;
 
                        /* Apply the mental bonuses to hit/damage, if known */
                        if (object_is_known(o_ptr))
                        {
-                               p_ptr->dis_to_h[default_hand] += bonus_to_h;
-                               p_ptr->dis_to_d[default_hand] += bonus_to_d;
+                               p_ptr->dis_to_h[default_hand] += (s16b)bonus_to_h;
+                               p_ptr->dis_to_d[default_hand] += (s16b)bonus_to_d;
                        }
                }
        }
@@ -4499,7 +4467,7 @@ void calc_bonuses(void)
        /* Hex bonuses */
        if (p_ptr->realm1 == REALM_HEX)
        {
-               if (hex_spelling_any()) p_ptr->skill_stl -= (1 + p_ptr->magic_num2[0]);
+               if (hex_spelling_any()) p_ptr->skill_stl -= (1 + CASTING_HEX_NUM(p_ptr));
                if (hex_spelling(HEX_DETECT_EVIL)) p_ptr->esp_evil = TRUE;
                if (hex_spelling(HEX_XTRA_MIGHT)) p_ptr->stat_add[A_STR] += 4;
                if (hex_spelling(HEX_BUILDING))
@@ -4526,7 +4494,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;
@@ -4534,8 +4502,8 @@ void calc_bonuses(void)
                        ac += 5;
                        if (o_ptr->curse_flags & TRC_HEAVY_CURSE) ac += 7;
                        if (o_ptr->curse_flags & TRC_PERMA_CURSE) ac += 13;
-                       p_ptr->to_a += ac;
-                       p_ptr->dis_to_a += ac;
+                       p_ptr->to_a += (s16b)ac;
+                       p_ptr->dis_to_a += (s16b)ac;
                }
        }
 
@@ -4551,12 +4519,11 @@ void calc_bonuses(void)
                if (p_ptr->stat_top[i] != top)
                {
                        /* Save the new value */
-                       p_ptr->stat_top[i] = top;
+                       p_ptr->stat_top[i] = (s16b)top;
 
                        /* Redisplay the stats later */
                        p_ptr->redraw |= (PR_STATS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
 
@@ -4577,12 +4544,11 @@ void calc_bonuses(void)
                if (p_ptr->stat_use[i] != use)
                {
                        /* Save the new value */
-                       p_ptr->stat_use[i] = use;
+                       p_ptr->stat_use[i] = (s16b)use;
 
                        /* Redisplay the stats later */
                        p_ptr->redraw |= (PR_STATS);
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
 
@@ -4600,7 +4566,7 @@ void calc_bonuses(void)
                if (p_ptr->stat_ind[i] != ind)
                {
                        /* Save the new index */
-                       p_ptr->stat_ind[i] = ind;
+                       p_ptr->stat_ind[i] = (s16b)ind;
 
                        /* Change in CON affects Hitpoints */
                        if (i == A_CON)
@@ -4635,7 +4601,6 @@ void calc_bonuses(void)
                                }
                        }
 
-                       /* Window stuff */
                        p_ptr->window |= (PW_PLAYER);
                }
        }
@@ -4892,10 +4857,10 @@ void calc_bonuses(void)
                }
                if (inventory[INVEN_RARM].tval == TV_POLEARM) penalty1 += 10;
                if (inventory[INVEN_LARM].tval == TV_POLEARM) penalty2 += 10;
-               p_ptr->to_h[0] -= penalty1;
-               p_ptr->to_h[1] -= penalty2;
-               p_ptr->dis_to_h[0] -= penalty1;
-               p_ptr->dis_to_h[1] -= penalty2;
+               p_ptr->to_h[0] -= (s16b)penalty1;
+               p_ptr->to_h[1] -= (s16b)penalty2;
+               p_ptr->dis_to_h[0] -= (s16b)penalty1;
+               p_ptr->dis_to_h[1] -= (s16b)penalty2;
        }
 
        /* Extract the current weight (in tenth pounds) */
@@ -4936,7 +4901,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 */
@@ -4987,7 +4952,7 @@ void calc_bonuses(void)
        /* Compute "extra shots" if needed */
        if (o_ptr->k_idx)
        {
-               p_ptr->tval_ammo = bow_tval_ammo(o_ptr);
+               p_ptr->tval_ammo = (byte_hack)bow_tval_ammo(o_ptr);
 
                /* Apply special flags */
                if (o_ptr->k_idx && !p_ptr->heavy_shoot)
@@ -5164,10 +5129,10 @@ void calc_bonuses(void)
                        p_ptr->num_blow[i] = blows_table[str_index][dex_index];
 
                        /* Maximal value */
-                       if (p_ptr->num_blow[i] > num) p_ptr->num_blow[i] = num;
+                       if (p_ptr->num_blow[i] > num) p_ptr->num_blow[i] = (s16b)num;
 
                        /* Add in the "bonus blows" */
-                       p_ptr->num_blow[i] += extra_blows[i];
+                       p_ptr->num_blow[i] += (s16b)extra_blows[i];
 
 
                        if (p_ptr->pclass == CLASS_WARRIOR) p_ptr->num_blow[i] += (p_ptr->lev / 40);
@@ -5283,8 +5248,8 @@ void calc_bonuses(void)
                                        penalty += 30;
                                        if (penalty < 30) penalty = 30;
                                }
-                               p_ptr->to_h[i] -= penalty;
-                               p_ptr->dis_to_h[i] -= penalty;
+                               p_ptr->to_h[i] -= (s16b)penalty;
+                               p_ptr->dis_to_h[i] -= (s16b)penalty;
 
                                /* Riding weapon */
                                p_ptr->riding_wield[i] = TRUE;
@@ -5323,8 +5288,8 @@ void calc_bonuses(void)
                        if (penalty < 30) penalty = 30;
                }
                if (p_ptr->tval_ammo == TV_BOLT) penalty *= 2;
-               p_ptr->to_h_b -= penalty;
-               p_ptr->dis_to_h_b -= penalty;
+               p_ptr->to_h_b -= (s16b)penalty;
+               p_ptr->dis_to_h_b -= (s16b)penalty;
        }
 
        /* Different calculation for monks with empty hands */
@@ -5340,10 +5305,10 @@ void calc_bonuses(void)
                        if (blow_base > 31) p_ptr->num_blow[0]++;
                        if (blow_base > 44) p_ptr->num_blow[0]++;
                        if (blow_base > 58) p_ptr->num_blow[0]++;
-                       if (p_ptr->magic_num1[0])
+                       if (P_PTR_KI)
                        {
-                               p_ptr->to_d[0] += (p_ptr->magic_num1[0]/5);
-                               p_ptr->dis_to_d[0] += (p_ptr->magic_num1[0]/5);
+                               p_ptr->to_d[0] += P_PTR_KI / 5;
+                               p_ptr->dis_to_d[0] += P_PTR_KI / 5;
                        }
                }
                else
@@ -5424,8 +5389,8 @@ void calc_bonuses(void)
        {
                if (buki_motteruka(INVEN_RARM+i))
                {
-                       int tval = inventory[INVEN_RARM+i].tval - TV_WEAPON_BEGIN;
-                       int sval = inventory[INVEN_RARM+i].sval;
+                       OBJECT_TYPE_VALUE tval = inventory[INVEN_RARM+i].tval - TV_WEAPON_BEGIN;
+                       OBJECT_SUBTYPE_VALUE sval = inventory[INVEN_RARM+i].sval;
 
                        p_ptr->to_h[i] += (p_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200;
                        p_ptr->dis_to_h[i] += (p_ptr->weapon_exp[tval][sval] - WEAPON_EXP_BEGINNER) / 200;
@@ -5485,7 +5450,6 @@ void calc_bonuses(void)
                /* Redraw */
                p_ptr->redraw |= (PR_ARMOR);
 
-               /* Window stuff */
                p_ptr->window |= (PW_PLAYER);
        }
 
@@ -5621,7 +5585,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."));
@@ -5644,7 +5607,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."));
@@ -5669,7 +5631,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."));
@@ -5689,11 +5650,10 @@ 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."));
-                               if (hack_mind)
+                               if (is_loading_now)
                                {
                                        chg_virtue(V_FAITH, -1);
                                }
@@ -5714,7 +5674,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
@@ -5740,7 +5699,7 @@ void calc_bonuses(void)
                if (heavy_armor())
                {
                        msg_print(_("装備が重くてバランスを取れない。", "The weight of your armor disrupts your balance."));
-                       if (hack_mind)
+                       if (is_loading_now)
                        {
                                chg_virtue(V_HARMONY, -1);
                        }
@@ -5849,7 +5808,6 @@ void notice_stuff(void)
  */
 void update_stuff(void)
 {
-       /* Update stuff */
        if (!p_ptr->update) return;
 
 
@@ -6260,13 +6218,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();
 }
 
@@ -6298,7 +6254,7 @@ s16b empty_hands(bool riding_control)
  */
 bool heavy_armor(void)
 {
-       u16b monk_arm_wgt = 0;
+       WEIGHT monk_arm_wgt = 0;
 
        if ((p_ptr->pclass != CLASS_MONK) && (p_ptr->pclass != CLASS_FORCETRAINER) && (p_ptr->pclass != CLASS_NINJA)) return FALSE;
 
@@ -6322,7 +6278,7 @@ void update_playtime(void)
        /* Check if the game has started */
        if (start_time != 0)
        {
-               u32b tmp = time(NULL);
+               u32b tmp = (u32b)time(NULL);
                playtime += (tmp - start_time);
                start_time = tmp;
        }