[Refactor] #37353 item_tester_learn_spell() を object-hook.c へ移動。 / Move item_tester_l...

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

diff --git a/src/effects.c b/src/effects.c
index af20f17..453fa84 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -13,6 +13,10 @@
  */
 
 #include "angband.h"
+#include "mutation.h"
+#include "quest.h"
+#include "avatar.h"
+#include "player-status.h"
 
 /*!
  * @brief プレイヤーの継続行動を設定する。
@@ -116,11 +120,7 @@ void set_action(ACTION_IDX typ)
                        break;
                }
        }
-
-       /* Recalculate bonuses */
        p_ptr->update |= (PU_BONUS);
-
-       /* Redraw the state */
        p_ptr->redraw |= (PR_STATE);
 }
 
@@ -173,7 +173,6 @@ void reset_tim_flags(void)
        p_ptr->dustrobe = 0;
        p_ptr->action = ACTION_NONE;
 
-
        p_ptr->oppose_acid = 0;     /* Timed -- oppose acid */
        p_ptr->oppose_elec = 0;     /* Timed -- oppose lightning */
        p_ptr->oppose_fire = 0;     /* Timed -- oppose heat */
@@ -266,23 +265,15 @@ void dispel_player(void)
 
        if (music_singing_any() || hex_spelling_any())
        {
-               cptr str = (music_singing_any()) ? _("歌", "singing") : _("呪文", "spelling");
+               concptr str = (music_singing_any()) ? _("歌", "singing") : _("呪文", "spelling");
                INTERUPTING_SONG_EFFECT(p_ptr) = SINGING_SONG_EFFECT(p_ptr);
                SINGING_SONG_EFFECT(p_ptr) = MUSIC_NONE;
                msg_format(_("%sが途切れた。", "Your %s is interrupted."), str);
-               p_ptr->action = ACTION_NONE;
-
-               /* Recalculate bonuses */
-               p_ptr->update |= (PU_BONUS | PU_HP);
 
-               /* Redraw map */
+               p_ptr->action = ACTION_NONE;
+               p_ptr->update |= (PU_BONUS | PU_HP | PU_MONSTERS);
                p_ptr->redraw |= (PR_MAP | PR_STATUS | PR_STATE);
-
-               /* Update monsters */
-               p_ptr->update |= (PU_MONSTERS);
-
                p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
                p_ptr->energy_need += ENERGY_NEED();
        }
 }
@@ -339,17 +330,13 @@ bool set_mimic(TIME_EFFECT v, IDX p, bool do_dec)
        if (!notice)
                return (FALSE);
 
-       if (disturb_state) disturb(0, 1);
+       if (disturb_state) disturb(FALSE, TRUE);
 
        /* Redraw title */
        p_ptr->redraw |= (PR_BASIC | PR_STATUS);
-
-       /* Recalculate bonuses */
        p_ptr->update |= (PU_BONUS | PU_HP);
 
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -418,20 +405,15 @@ bool set_blind(TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
+       if (disturb_state) disturb(FALSE, FALSE);
 
        /* Fully update the visuals */
        p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE | PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -516,12 +498,8 @@ bool set_confused(TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -569,12 +547,8 @@ bool set_poisoned(TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -636,12 +610,8 @@ bool set_afraid(TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -695,15 +665,9 @@ bool set_paralyzed(TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Redraw the state */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->redraw |= (PR_STATE);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -721,6 +685,7 @@ bool set_image(TIME_EFFECT v)
        v = (v > 10000) ? 10000 : (v < 0) ? 0 : v;
 
        if (p_ptr->is_dead) return FALSE;
+       if (p_ptr->pseikaku == SEIKAKU_CHARGEMAN) v = 0;
 
 
        /* Open */
@@ -758,23 +723,16 @@ bool set_image(TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 1);
+       if (disturb_state) disturb(FALSE, TRUE);
 
-       /* Redraw map */
        p_ptr->redraw |= (PR_MAP);
 
        /* Update the health bar */
        p_ptr->redraw |= (PR_HEALTH | PR_UHEALTH);
-
-       /* Update monsters */
        p_ptr->update |= (PU_MONSTERS);
 
        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -825,15 +783,9 @@ bool set_fast(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -886,15 +838,9 @@ bool set_lightspeed(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -943,15 +889,9 @@ bool set_slow(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1004,15 +944,9 @@ bool set_shield(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1065,15 +999,9 @@ bool set_tsubureru(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1126,15 +1054,9 @@ bool set_magicdef(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1186,15 +1108,9 @@ bool set_blessed(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1247,18 +1163,12 @@ bool set_hero(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
        p_ptr->update |= (PU_HP);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1311,18 +1221,12 @@ bool set_shero(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
        p_ptr->update |= (PU_HP);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1374,12 +1278,8 @@ bool set_protevil(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1414,10 +1314,7 @@ bool set_wraith_form(TIME_EFFECT v, bool do_dec)
                        chg_virtue(V_SACRIFICE, -2);
                        chg_virtue(V_VALOUR, -5);
 
-                       /* Redraw map */
                        p_ptr->redraw |= (PR_MAP);
-
-                       /* Update monsters */
                        p_ptr->update |= (PU_MONSTERS);
 
                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -1432,10 +1329,7 @@ bool set_wraith_form(TIME_EFFECT v, bool do_dec)
                        msg_print(_("不透明になった感じがする。", "You feel opaque."));
                        notice = TRUE;
 
-                       /* Redraw map */
                        p_ptr->redraw |= (PR_MAP);
-
-                       /* Update monsters */
                        p_ptr->update |= (PU_MONSTERS);
 
                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -1451,15 +1345,9 @@ bool set_wraith_form(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 
 }
@@ -1496,10 +1384,7 @@ bool set_invuln(TIME_EFFECT v, bool do_dec)
                        chg_virtue(V_SACRIFICE, -3);
                        chg_virtue(V_VALOUR, -5);
 
-                       /* Redraw map */
                        p_ptr->redraw |= (PR_MAP);
-
-                       /* Update monsters */
                        p_ptr->update |= (PU_MONSTERS);
 
                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -1514,10 +1399,7 @@ bool set_invuln(TIME_EFFECT v, bool do_dec)
                        msg_print(_("無敵ではなくなった。", "The invulnerability wears off."));
                        notice = TRUE;
 
-                       /* Redraw map */
                        p_ptr->redraw |= (PR_MAP);
-
-                       /* Update monsters */
                        p_ptr->update |= (PU_MONSTERS);
 
                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
@@ -1535,15 +1417,9 @@ bool set_invuln(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1595,18 +1471,10 @@ bool set_tim_esp(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Update the monsters */
        p_ptr->update |= (PU_MONSTERS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1658,18 +1526,12 @@ bool set_tim_invis(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Update the monsters */
        p_ptr->update |= (PU_MONSTERS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1721,18 +1583,12 @@ bool set_tim_infra(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Update the monsters */
        p_ptr->update |= (PU_MONSTERS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1784,15 +1640,9 @@ bool set_tim_regen(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1844,15 +1694,9 @@ bool set_tim_stealth(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -1909,9 +1753,7 @@ bool set_superstealth(bool set)
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Result */
+       if (disturb_state) disturb(FALSE, FALSE);
        return (TRUE);
 }
 
@@ -1963,15 +1805,9 @@ bool set_tim_levitation(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2023,12 +1859,8 @@ bool set_tim_sh_touki(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2080,15 +1912,9 @@ bool set_tim_sh_fire(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2140,15 +1966,9 @@ bool set_tim_sh_holy(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2200,15 +2020,9 @@ bool set_tim_eyeeye(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2261,15 +2075,9 @@ bool set_resist_magic(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2321,15 +2129,9 @@ bool set_tim_reflect(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2379,15 +2181,9 @@ bool set_multishadow(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2439,15 +2235,9 @@ bool set_dustrobe(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2499,15 +2289,9 @@ bool set_kabenuke(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2565,18 +2349,12 @@ bool set_tsuyoshi(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Recalculate hitpoints */
        p_ptr->update |= (PU_HP);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2646,14 +2424,12 @@ bool set_ele_attack(u32b attack_type, TIME_EFFECT v)
 #endif
        }
 
-       if (disturb_state) disturb(0, 0);
+       if (disturb_state) disturb(FALSE, FALSE);
 
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
 
        return (TRUE);
@@ -2725,14 +2501,12 @@ bool set_ele_immune(u32b immune_type, TIME_EFFECT v)
 #endif
        }
 
-       if (disturb_state) disturb(0, 0);
+       if (disturb_state) disturb(FALSE, FALSE);
 
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
 
        return (TRUE);
@@ -2786,12 +2560,8 @@ bool set_oppose_acid(TIME_EFFECT v, bool do_dec)
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2843,12 +2613,8 @@ bool set_oppose_elec(TIME_EFFECT v, bool do_dec)
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2901,12 +2667,8 @@ bool set_oppose_fire(TIME_EFFECT v, bool do_dec)
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -2958,12 +2720,8 @@ bool set_oppose_cold(TIME_EFFECT v, bool do_dec)
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -3016,12 +2774,8 @@ bool set_oppose_pois(TIME_EFFECT v, bool do_dec)
        /* Redraw status bar */
        p_ptr->redraw |= (PR_STATUS);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Handle stuff */
+       if (disturb_state) disturb(FALSE, FALSE);
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -3157,7 +2911,7 @@ bool set_stun(TIME_EFFECT v)
                case 0:
                        msg_print(_("やっと朦朧状態から回復した。", "You are no longer stunned."));
 
-                       if (disturb_state) disturb(0, 0);
+                       if (disturb_state) disturb(FALSE, FALSE);
                        break;
                }
 
@@ -3170,18 +2924,12 @@ bool set_stun(TIME_EFFECT v)
        /* No change */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Redraw the "stun" */
        p_ptr->redraw |= (PR_STUN);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -3356,7 +3104,7 @@ bool set_cut(TIME_EFFECT v)
                        case 0:
                        msg_format(_("やっと%s。", "You are no longer bleeding."), p_ptr->prace == RACE_ANDROID ? "怪我が直った" : "出血が止まった");
 
-                       if (disturb_state) disturb(0, 0);
+                       if (disturb_state) disturb(FALSE, FALSE);
                        break;
                }
 
@@ -3369,18 +3117,12 @@ bool set_cut(TIME_EFFECT v)
        /* No change */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Redraw the "cut" */
        p_ptr->redraw |= (PR_CUT);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -3569,18 +3311,12 @@ bool set_food(TIME_EFFECT v)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
 
        /* Redraw hunger */
        p_ptr->redraw |= (PR_HUNGER);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -3639,8 +3375,6 @@ bool inc_stat(int stat)
                {
                        p_ptr->stat_max[stat] = value;
                }
-
-               /* Recalculate bonuses */
                p_ptr->update |= (PU_BONUS);
 
                /* Success */
@@ -3772,10 +3506,7 @@ bool dec_stat(int stat, int amount, int permanent)
                p_ptr->stat_cur[stat] = cur;
                p_ptr->stat_max[stat] = max;
 
-               /* Redisplay the stats later */
                p_ptr->redraw |= (PR_STATS);
-
-               /* Recalculate bonuses */
                p_ptr->update |= (PU_BONUS);
        }
 
@@ -3793,13 +3524,8 @@ bool res_stat(int stat)
        /* Restore if needed */
        if (p_ptr->stat_cur[stat] != p_ptr->stat_max[stat])
        {
-               /* Restore */
                p_ptr->stat_cur[stat] = p_ptr->stat_max[stat];
-
-               /* Recalculate bonuses */
                p_ptr->update |= (PU_BONUS);
-
-               /* Redisplay the stats later */
                p_ptr->redraw |= (PR_STATS);
 
                /* Success */
@@ -3840,7 +3566,6 @@ bool hp_player(int num)
                        p_ptr->chp_frac = 0;
                }
 
-               /* Redraw */
                p_ptr->redraw |= (PR_HP);
 
                p_ptr->window |= (PW_PLAYER);
@@ -3880,7 +3605,7 @@ bool hp_player(int num)
 /*
  * Array of stat "descriptions"
  */
-static cptr desc_stat_pos[] =
+static concptr desc_stat_pos[] =
 {
        _("強く", "strong"),
        _("知的に", "smart"),
@@ -3894,7 +3619,7 @@ static cptr desc_stat_pos[] =
 /*
  * Array of stat "descriptions"
  */
-static cptr desc_stat_neg[] =
+static concptr desc_stat_neg[] =
 {
        _("弱く", "weak"),
        _("無知に", "stupid"),
@@ -4066,12 +3791,8 @@ bool lose_all_info(void)
                /* Hack -- Clear the "felt" flag */
                o_ptr->ident &= ~(IDENT_SENSE);
        }
-
-       /* Recalculate bonuses */
        p_ptr->update |= (PU_BONUS);
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+       p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
 
@@ -4111,9 +3832,9 @@ void do_poly_wounds(void)
 /*
  * Change player race
  */
-void change_race(CHARACTER_IDX new_race, cptr effect_msg)
+void change_race(CHARACTER_IDX new_race, concptr effect_msg)
 {
-       cptr title = race_info[new_race].title;
+       concptr title = race_info[new_race].title;
        int  old_race = p_ptr->prace;
 
 #ifdef JP
@@ -4214,7 +3935,7 @@ void do_poly_self(void)
                        /* Harmful deformity */
                        power -= 15;
 
-                       while (tmp < 6)
+                       while (tmp < A_MAX)
                        {
                                if (one_in_(2))
                                {
@@ -4265,7 +3986,7 @@ void do_poly_self(void)
                power -= 20;
                msg_format(_("%sの構成が変化した！", "Your internal organs are rearranged!"), p_ptr->prace == RACE_ANDROID ? "機械" : "内臓");
 
-               while (tmp < 6)
+               while (tmp < A_MAX)
                {
                        (void)dec_stat(tmp, randint1(6) + 6, one_in_(3));
                        tmp++;
@@ -4318,7 +4039,7 @@ void do_poly_self(void)
  * setting the player to "dead".
  */
 
-int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
+int take_hit(int damage_type, HIT_POINT damage, concptr hit_from, int monspell)
 {
        int old_chp = p_ptr->chp;
 
@@ -4337,7 +4058,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
 
        if (damage_type != DAMAGE_USELIFE)
        {
-               disturb(1, 1);
+               disturb(TRUE, TRUE);
                if (auto_more)
                {
                        now_damaged = TRUE;
@@ -4441,7 +4162,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
 
                if (p_ptr->inside_arena)
                {
-                       cptr m_name = r_name+r_info[arena_info[p_ptr->arena_number].r_idx].name;
+                       concptr m_name = r_name+r_info[arena_info[p_ptr->arena_number].r_idx].name;
                        msg_format(_("あなたは%sの前に敗れ去った。", "You are beaten by %s."), m_name);
                        msg_print(NULL);
                        if (record_arena) do_cmd_write_nikki(NIKKI_ARENA, -1 - p_ptr->arena_number, m_name);
@@ -4569,7 +4290,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
                                        int h = Term->hgt;
                                        int msg_pos_x[9] = {  5,  7,  9, 12,  14,  17,  19,  21, 23};
                                        int msg_pos_y[9] = {  3,  4,  5,  4,   5,   4,   5,   6,  4};
-                                       cptr str;
+                                       concptr str;
                                        char* str2;
 
                                        Term_clear();
@@ -4712,8 +4433,6 @@ void calc_android_exp(void)
 
                if ((i == INVEN_RIGHT) || (i == INVEN_LEFT) || (i == INVEN_NECK) || (i == INVEN_LITE)) continue;
                if (!o_ptr->k_idx) continue;
-
-               /* Wipe the object */
                object_wipe(q_ptr);
 
                object_copy(q_ptr, o_ptr);
@@ -4780,7 +4499,7 @@ void calc_android_exp(void)
                        if (value > 100000L)
                                exp += (value - 100000L) / 4  * level;
                }
-               if ((((i == INVEN_RARM) || (i == INVEN_LARM)) && (buki_motteruka(i))) || (i == INVEN_BOW)) total_exp += exp / 48;
+               if ((((i == INVEN_RARM) || (i == INVEN_LARM)) && (has_melee_weapon(i))) || (i == INVEN_BOW)) total_exp += exp / 48;
                else total_exp += exp / 16;
                if (i == INVEN_BODY) total_exp += exp / 32;
        }
@@ -4883,15 +4602,9 @@ bool set_ultimate_res(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -4937,15 +4650,9 @@ bool set_tim_res_nether(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -4991,15 +4698,9 @@ bool set_tim_res_time(TIME_EFFECT v, bool do_dec)
        /* Nothing to notice */
        if (!notice) return (FALSE);
 
-       if (disturb_state) disturb(0, 0);
-
-       /* Recalculate bonuses */
+       if (disturb_state) disturb(FALSE, FALSE);
        p_ptr->update |= (PU_BONUS);
-
-       /* Handle stuff */
        handle_stuff();
-
-       /* Result */
        return (TRUE);
 }
 
@@ -5013,13 +4714,11 @@ bool choose_ele_attack(void)
 
        char choice;
 
-       if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))
+       if (!has_melee_weapon(INVEN_RARM) && !has_melee_weapon(INVEN_LARM))
        {
                msg_format(_("武器を持たないと魔法剣は使えない。", "You cannot use temporary branding with no weapon."));
                return FALSE;
        }
-
-       /* Save screen */
        screen_save();
 
        num = (p_ptr->lev - 20) / 5;
@@ -5070,7 +4769,6 @@ bool choose_ele_attack(void)
                screen_load();
                return FALSE;
        }
-       /* Load screen */
        screen_load();
        return TRUE;
 }
@@ -5082,8 +4780,6 @@ bool choose_ele_attack(void)
 bool choose_ele_immune(TIME_EFFECT immune_turn)
 {
        char choice;
-
-       /* Save screen */
        screen_save();
 
        c_prt(TERM_RED,    _("        a) 火炎", "        a) Immune Fire"), 2, 14);
@@ -5115,7 +4811,6 @@ bool choose_ele_immune(TIME_EFFECT immune_turn)
                screen_load();
                return FALSE;
        }
-       /* Load screen */
        screen_load();
        return TRUE;
 }