OSDN Git Service

[Refactor] #38997 monster_gain_exp() にplayer_type * 引数を追加 / Added player_type * argum...
[hengband/hengband.git] / src / spells1.c
index dd0ec9f..a9a553f 100644 (file)
@@ -321,7 +321,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                if (message)
                {
                        msg_format(_("木は%s。", "A tree %s"), message);
-                       cave_set_feat(floor_ptr, y, x, one_in_(3) ? feat_brake : feat_grass);
+                       cave_set_feat(caster_ptr, y, x, one_in_(3) ? feat_brake : feat_grass);
 
                        /* Observe */
                        if (g_ptr->info & (CAVE_MARK)) obvious = TRUE;
@@ -373,7 +373,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                        if (is_hidden_door(g_ptr))
                        {
                                /* Pick a door */
-                               disclose_grid(caster_ptr->current_floor_ptr, y, x);
+                               disclose_grid(caster_ptr, y, x);
 
                                /* Check line of sight */
                                if (known)
@@ -393,7 +393,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                                }
 
                                /* Destroy the trap */
-                               cave_alter_feat(y, x, FF_DISARM);
+                               cave_alter_feat(caster_ptr, y, x, FF_DISARM);
                        }
 
                        /* Locked doors are unlocked */
@@ -402,7 +402,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                                FEAT_IDX old_feat = g_ptr->feat;
 
                                /* Unlock the door */
-                               cave_alter_feat(y, x, FF_DISARM);
+                               cave_alter_feat(caster_ptr, y, x, FF_DISARM);
 
                                /* Check line of sound */
                                if (known && (old_feat != g_ptr->feat))
@@ -437,7 +437,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                                }
 
                                /* Destroy the feature */
-                               cave_alter_feat(y, x, FF_TUNNEL);
+                               cave_alter_feat(caster_ptr, y, x, FF_TUNNEL);
                        }
 
                        /* Remove "unsafe" flag if player is not blind */
@@ -458,7 +458,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                                s16b old_mimic = g_ptr->mimic;
                                feature_type *mimic_f_ptr = &f_info[get_feat_mimic(g_ptr)];
 
-                               cave_alter_feat(y, x, FF_SPIKE);
+                               cave_alter_feat(caster_ptr, y, x, FF_SPIKE);
                                g_ptr->mimic = old_mimic;
 
                                note_spot(y, x);
@@ -487,7 +487,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                                }
 
                                /* Destroy the wall */
-                               cave_alter_feat(y, x, FF_HURT_ROCK);
+                               cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK);
                                caster_ptr->update |= (PU_FLOW);
                        }
 
@@ -498,14 +498,14 @@ if (have_flag(f_ptr->flags, FF_TREE))
                {
                        if (!cave_naked_bold(caster_ptr, floor_ptr, y, x)) break;
                        if (player_bold(caster_ptr, y, x)) break;
-                       cave_set_feat(floor_ptr, y, x, feat_door[DOOR_DOOR].closed);
+                       cave_set_feat(caster_ptr, y, x, feat_door[DOOR_DOOR].closed);
                        if (g_ptr->info & (CAVE_MARK)) obvious = TRUE;
                        break;
                }
 
                case GF_MAKE_TRAP:
                {
-                       place_trap(floor_ptr, y, x);
+                       place_trap(caster_ptr, y, x);
                        break;
                }
 
@@ -513,7 +513,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                {
                        if (!cave_naked_bold(caster_ptr, floor_ptr, y, x)) break;
                        if (player_bold(caster_ptr, y, x)) break;
-                       cave_set_feat(floor_ptr, y, x, feat_tree);
+                       cave_set_feat(caster_ptr, y, x, feat_tree);
                        if (g_ptr->info & (CAVE_MARK)) obvious = TRUE;
                        break;
                }
@@ -532,7 +532,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                {
                        if (!cave_naked_bold(caster_ptr, floor_ptr, y, x)) break;
                        if (player_bold(caster_ptr, y, x)) break;
-                       cave_set_feat(floor_ptr, y, x, feat_granite);
+                       cave_set_feat(caster_ptr, y, x, feat_granite);
                        break;
                }
 
@@ -542,11 +542,11 @@ if (have_flag(f_ptr->flags, FF_TREE))
                        if (dam == 1)
                        {
                                if (!have_flag(f_ptr->flags, FF_FLOOR)) break;
-                               cave_set_feat(floor_ptr, y, x, feat_shallow_lava);
+                               cave_set_feat(caster_ptr, y, x, feat_shallow_lava);
                        }
                        else if (dam)
                        {
-                               cave_set_feat(floor_ptr, y, x, feat_deep_lava);
+                               cave_set_feat(caster_ptr, y, x, feat_deep_lava);
                        }
 
                        break;
@@ -558,11 +558,11 @@ if (have_flag(f_ptr->flags, FF_TREE))
                        if (dam == 1)
                        {
                                if (!have_flag(f_ptr->flags, FF_FLOOR)) break;
-                               cave_set_feat(floor_ptr, y, x, feat_shallow_water);
+                               cave_set_feat(caster_ptr, y, x, feat_shallow_water);
                        }
                        else if (dam)
                        {
-                               cave_set_feat(floor_ptr, y, x, feat_deep_water);
+                               cave_set_feat(caster_ptr, y, x, feat_deep_water);
                        }
 
                        break;
@@ -659,7 +659,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                {
                        if (is_mirror_grid(g_ptr))
                        {
-                               msg_print(_("鏡が割れた!", "The mirror was crashed!"));
+                               msg_print(_("鏡が割れた!", "The mirror was shattered!"));
                                sound(SOUND_GLASS);
                                remove_mirror(caster_ptr, y, x);
                                project(caster_ptr, 0, 2, y, x, caster_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
@@ -669,12 +669,12 @@ if (have_flag(f_ptr->flags, FF_TREE))
                        {
                                if (known && (g_ptr->info & CAVE_MARK))
                                {
-                                       msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
+                                       msg_format(_("%sが割れた!", "The %s crumbled!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
                                        sound(SOUND_GLASS);
                                }
 
                                /* Destroy the wall */
-                               cave_alter_feat(y, x, FF_HURT_ROCK);
+                               cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK);
                                caster_ptr->update |= (PU_FLOW);
                        }
 
@@ -685,7 +685,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                {
                        if (is_mirror_grid(g_ptr) && caster_ptr->lev < 40)
                        {
-                               msg_print(_("鏡が割れた!", "The mirror was crashed!"));
+                               msg_print(_("鏡が割れた!", "The mirror was shattered!"));
                                sound(SOUND_GLASS);
                                remove_mirror(caster_ptr, y, x);
                                project(caster_ptr, 0, 2, y, x, caster_ptr->lev / 2 + 5, GF_SHARDS, (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP | PROJECT_NO_HANGEKI), -1);
@@ -695,12 +695,12 @@ if (have_flag(f_ptr->flags, FF_TREE))
                        {
                                if (known && (g_ptr->info & CAVE_MARK))
                                {
-                                       msg_format(_("%sが割れた!", "The %s was crashed!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
+                                       msg_format(_("%sが割れた!", "The %s crumbled!"), f_name + f_info[get_feat_mimic(g_ptr)].name);
                                        sound(SOUND_GLASS);
                                }
 
                                /* Destroy the wall */
-                               cave_alter_feat(y, x, FF_HURT_ROCK);
+                               cave_alter_feat(caster_ptr, y, x, FF_HURT_ROCK);
                                caster_ptr->update |= (PU_FLOW);
                        }
 
@@ -717,7 +717,7 @@ if (have_flag(f_ptr->flags, FF_TREE))
                        /* But not protect monsters and other objects */
                        if (have_flag(f_ptr->flags, FF_HURT_DISI) && !have_flag(f_ptr->flags, FF_PERMANENT))
                        {
-                               cave_alter_feat(y, x, FF_HURT_DISI);
+                               cave_alter_feat(caster_ptr, y, x, FF_HURT_DISI);
 
                                /* Update some things -- similar to GF_KILL_WALL */
                                caster_ptr->update |= (PU_FLOW);
@@ -952,7 +952,7 @@ static bool project_o(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSI
                                identify_item(caster_ptr, o_ptr);
 
                                /* Auto-inscription */
-                               autopick_alter_item((-this_o_idx), FALSE);
+                               autopick_alter_item(caster_ptr, (-this_o_idx), FALSE);
                                break;
                        }
 
@@ -1052,7 +1052,7 @@ static bool project_o(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSI
 
                                k_idx = o_ptr->k_idx;
                                is_potion = object_is_potion(o_ptr);
-                               delete_object_idx(this_o_idx);
+                               delete_object_idx(caster_ptr->current_floor_ptr, this_o_idx);
 
                                /* Potions produce effects when 'shattered' */
                                if (is_potion)
@@ -1066,12 +1066,13 @@ static bool project_o(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSI
        }
 
        /* Return "Anything seen?" */
-       return (obvious);
+       return obvious;
 }
 
 
 /*!
  * @brief 汎用的なビーム/ボルト/ボール系によるモンスターへの効果処理 / Handle a beam/bolt/ball causing damage to a monster.
+ * @param caster_ptr プレーヤーへの参照ポインタ
  * @param who 魔法を発動したモンスター(0ならばプレイヤー) / Index of "source" monster (zero for "player")
  * @param r 効果半径(ビーム/ボルト = 0 / ボール = 1以上) / Radius of explosion (0 = beam/bolt, 1 to 9 = ball)
  * @param y 目標Y座標 / Target y location (or location to travel "towards")
@@ -1138,12 +1139,11 @@ static bool project_o(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSI
  * "flg" was added.
  * </pre>
  */
-
-
-static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, bool see_s_msg)
+static bool project_m(player_type *caster_ptr, MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, bool see_s_msg)
 {
        int tmp;
 
+       floor_type *floor_ptr = caster_ptr->current_floor_ptr;
        grid_type *g_ptr = &floor_ptr->grid_array[y][x];
 
        monster_type *m_ptr = &floor_ptr->m_list[g_ptr->m_idx];
@@ -1209,16 +1209,16 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
        DEPTH caster_lev = (who > 0) ? r_info[m_caster_ptr->r_idx].level : (caster_ptr->lev * 2);
 
        /* Nobody here */
-       if (!g_ptr->m_idx) return (FALSE);
+       if (!g_ptr->m_idx) return FALSE;
 
        /* Never affect projector */
-       if (who && (g_ptr->m_idx == who)) return (FALSE);
-       if ((g_ptr->m_idx == caster_ptr->riding) && !who && !(typ == GF_OLD_HEAL) && !(typ == GF_OLD_SPEED) && !(typ == GF_STAR_HEAL)) return (FALSE);
+       if (who && (g_ptr->m_idx == who)) return FALSE;
+       if ((g_ptr->m_idx == caster_ptr->riding) && !who && !(typ == GF_OLD_HEAL) && !(typ == GF_OLD_SPEED) && !(typ == GF_STAR_HEAL)) return FALSE;
        if (sukekaku && ((m_ptr->r_idx == MON_SUKE) || (m_ptr->r_idx == MON_KAKU))) return FALSE;
 
        /* Don't affect already death monsters */
        /* Prevents problems with chain reactions of exploding monsters */
-       if (m_ptr->hp < 0) return (FALSE);
+       if (m_ptr->hp < 0) return FALSE;
 
        /* Reduce damage by distance */
        dam = (dam + r) / (r + 1);
@@ -1584,7 +1584,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                                /* Normal monsters slow down */
                                else
                                {
-                                       if (set_monster_slow(g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
+                                       if (set_monster_slow(caster_ptr, g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
                                                note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
@@ -1652,7 +1652,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                                /* Normal monsters slow down */
                                else
                                {
-                                       if (set_monster_slow(g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
+                                       if (set_monster_slow(caster_ptr, g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
                                                note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
@@ -1704,7 +1704,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        if (seen) obvious = TRUE;
 
                        /* PSI only works if the monster can see you! -- RG */
-                       if (!(los(floor_ptr, m_ptr->fy, m_ptr->fx, caster_ptr->y, caster_ptr->x)))
+                       if (!(los(caster_ptr, m_ptr->fy, m_ptr->fx, caster_ptr->y, caster_ptr->x)))
                        {
                                if (seen_msg)
                                        msg_format(_("%sはあなたが見えないので影響されない!", "%^s can't see you, and isn't affected!"), m_name);
@@ -2127,7 +2127,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        if (seen) obvious = TRUE;
 
                        /* Wake up */
-                       (void)set_monster_csleep(g_ptr->m_idx, 0);
+                       (void)set_monster_csleep(caster_ptr, g_ptr->m_idx, 0);
 
                        if (m_ptr->maxhp < m_ptr->max_maxhp)
                        {
@@ -2150,21 +2150,21 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        if (seen) obvious = TRUE;
 
                        /* Wake up */
-                       (void)set_monster_csleep(g_ptr->m_idx, 0);
+                       (void)set_monster_csleep(caster_ptr, g_ptr->m_idx, 0);
                        if (MON_STUNNED(m_ptr))
                        {
                                if (seen_msg) msg_format(_("%^sは朦朧状態から立ち直った。", "%^s is no longer stunned."), m_name);
-                               (void)set_monster_stunned(g_ptr->m_idx, 0);
+                               (void)set_monster_stunned(caster_ptr, g_ptr->m_idx, 0);
                        }
                        if (MON_CONFUSED(m_ptr))
                        {
                                if (seen_msg) msg_format(_("%^sは混乱から立ち直った。", "%^s is no longer confused."), m_name);
-                               (void)set_monster_confused(g_ptr->m_idx, 0);
+                               (void)set_monster_confused(caster_ptr, g_ptr->m_idx, 0);
                        }
                        if (MON_MONFEAR(m_ptr))
                        {
                                if (seen_msg) msg_format(_("%^sは勇気を取り戻した。", "%^s recovers %s courage."), m_name);
-                               (void)set_monster_monfear(g_ptr->m_idx, 0);
+                               (void)set_monster_monfear(caster_ptr, g_ptr->m_idx, 0);
                        }
 
                        /* Heal */
@@ -2218,7 +2218,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        if (seen) obvious = TRUE;
 
                        /* Speed up */
-                       if (set_monster_fast(g_ptr->m_idx, MON_FAST(m_ptr) + 100))
+                       if (set_monster_fast(caster_ptr, g_ptr->m_idx, MON_FAST(m_ptr) + 100))
                        {
                                note = _("の動きが速くなった。", " starts moving faster.");
                        }
@@ -2253,7 +2253,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        /* Normal monsters slow down */
                        else
                        {
-                               if (set_monster_slow(g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
+                               if (set_monster_slow(caster_ptr, g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                {
                                        note = _("の動きが遅くなった。", " starts moving slower.");
                                }
@@ -3229,7 +3229,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                                        do_conf = randint0(8) + 8;
                                        do_stun = randint0(8) + 8;
                                }
-                               (void)set_monster_slow(g_ptr->m_idx, MON_SLOW(m_ptr) + 10);
+                               (void)set_monster_slow(caster_ptr, g_ptr->m_idx, MON_SLOW(m_ptr) + 10);
                        }
                        break;
                }
@@ -3361,7 +3361,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
 
                                delete_monster_idx(g_ptr->m_idx);
 
-                               return (TRUE);
+                               return TRUE;
                        }
                        else
                        {
@@ -3419,7 +3419,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                                /* Normal monsters slow down */
                                else
                                {
-                                       if (set_monster_slow(g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
+                                       if (set_monster_slow(caster_ptr, g_ptr->m_idx, MON_SLOW(m_ptr) + 50))
                                        {
                                                note = _("の動きが遅くなった。", " starts moving slower.");
                                        }
@@ -3484,7 +3484,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        if (seen) obvious = TRUE;
                        if (genocide_aux(caster_ptr, g_ptr->m_idx, dam, !who, (r_ptr->level + 1) / 2, _("モンスター消滅", "Genocide One")))
                        {
-                               if (seen_msg) msg_format(_("%sは消滅した!", "%^s disappered!"), m_name);
+                               if (seen_msg) msg_format(_("%sは消滅した!", "%^s disappeared!"), m_name);
                                chg_virtue(caster_ptr, V_VITALITY, -1);
                                return TRUE;
                        }
@@ -3544,7 +3544,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                                if (is_pet(m_ptr))
                                {
                                        note = _("の動きが速くなった。", " starts moving faster.");
-                                       (void)set_monster_fast(g_ptr->m_idx, MON_FAST(m_ptr) + 100);
+                                       (void)set_monster_fast(caster_ptr, g_ptr->m_idx, MON_FAST(m_ptr) + 100);
                                        success = TRUE;
                                }
 
@@ -3562,7 +3562,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                                {
                                        note = _("を支配した。", " is tamed!");
                                        set_pet(m_ptr);
-                                       (void)set_monster_fast(g_ptr->m_idx, MON_FAST(m_ptr) + 100);
+                                       (void)set_monster_fast(caster_ptr, g_ptr->m_idx, MON_FAST(m_ptr) + 100);
 
                                        /* Learn about type */
                                        if (is_original_ap_and_seen(m_ptr)) r_ptr->r_flags3 |= (RF3_GOOD);
@@ -3611,7 +3611,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
        }
 
        /* Absolutely no effect */
-       if (skipped) return (FALSE);
+       if (skipped) return FALSE;
 
        /* "Unique" monsters cannot be polymorphed */
        if (r_ptr->flags1 & (RF1_UNIQUE)) do_poly = FALSE;
@@ -3635,7 +3635,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
 
        /* Modify the damage */
        tmp = dam;
-       dam = mon_damage_mod(m_ptr, dam, (bool)(typ == GF_PSY_SPEAR));
+       dam = mon_damage_mod(caster_ptr, m_ptr, dam, (bool)(typ == GF_PSY_SPEAR));
        if ((tmp > 0) && (dam == 0)) note = _("はダメージを受けていない。", " is unharmed.");
 
        /* Check for death */
@@ -3666,7 +3666,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        }
 
                        /* Apply stun */
-                       (void)set_monster_stunned(g_ptr->m_idx, tmp);
+                       (void)set_monster_stunned(caster_ptr, g_ptr->m_idx, tmp);
 
                        /* Get angry */
                        get_angry = TRUE;
@@ -3694,7 +3694,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        }
 
                        /* Apply confusion */
-                       (void)set_monster_confused(g_ptr->m_idx, tmp);
+                       (void)set_monster_confused(caster_ptr, g_ptr->m_idx, tmp);
 
                        /* Get angry */
                        get_angry = TRUE;
@@ -3761,7 +3761,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                if (do_fear)
                {
                        /* Set fear */
-                       (void)set_monster_monfear(g_ptr->m_idx, MON_MONFEAR(m_ptr) + do_fear);
+                       (void)set_monster_monfear(caster_ptr, g_ptr->m_idx, MON_MONFEAR(m_ptr) + do_fear);
 
                        /* Get angry */
                        get_angry = TRUE;
@@ -3781,7 +3781,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                if (caster_ptr->riding == g_ptr->m_idx) caster_ptr->redraw |= (PR_UHEALTH);
 
                /* Wake the monster up */
-               (void)set_monster_csleep(g_ptr->m_idx, 0);
+               (void)set_monster_csleep(caster_ptr, g_ptr->m_idx, 0);
 
                /* Hurt the monster */
                m_ptr->hp -= dam;
@@ -3808,7 +3808,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                                }
                        }
 
-                       if (who > 0) monster_gain_exp(who, m_ptr->r_idx);
+                       if (who > 0) monster_gain_exp(caster_ptr, who, m_ptr->r_idx);
 
                        /* Generate treasure, etc */
                        monster_death(g_ptr->m_idx, FALSE);
@@ -3839,7 +3839,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        }
 
                        /* Hack -- handle sleep */
-                       if (do_sleep) (void)set_monster_csleep(g_ptr->m_idx, do_sleep);
+                       if (do_sleep) (void)set_monster_csleep(caster_ptr, g_ptr->m_idx, do_sleep);
                }
        }
 
@@ -3864,7 +3864,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                bool fear = FALSE;
 
                /* Hurt the monster, check for fear and death */
-               if (mon_take_hit(g_ptr->m_idx, dam, &fear, note_dies))
+               if (mon_take_hit(caster_ptr, g_ptr->m_idx, dam, &fear, note_dies))
                {
                        /* Dead monster */
                }
@@ -3896,7 +3896,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
                        }
 
                        /* Hack -- handle sleep */
-                       if (do_sleep) (void)set_monster_csleep(g_ptr->m_idx, do_sleep);
+                       if (do_sleep) (void)set_monster_csleep(caster_ptr, g_ptr->m_idx, do_sleep);
                }
        }
 
@@ -3909,7 +3909,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
        {
                caster_ptr->health_who = g_ptr->m_idx;
                caster_ptr->redraw |= (PR_HEALTH);
-               handle_stuff();
+               handle_stuff(caster_ptr);
        }
 
        /* Verify this code */
@@ -3959,7 +3959,7 @@ static bool project_m(player_type *caster_ptr, floor_type *floor_ptr, MONSTER_ID
 
                /* Mark the item as fully known */
                q_ptr->ident |= (IDENT_MENTAL);
-               (void)drop_near(q_ptr, -1, caster_ptr->y, caster_ptr->x);
+               (void)drop_near(caster_ptr, q_ptr, -1, caster_ptr->y, caster_ptr->x);
        }
 
        /* Track it */
@@ -4026,7 +4026,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
 
 
        /* Player is not here */
-       if (!player_bold(target_ptr, y, x)) return (FALSE);
+       if (!player_bold(target_ptr, y, x)) return FALSE;
 
        if ((target_ptr->special_defense & NINJA_KAWARIMI) && dam && (randint0(55) < (target_ptr->lev * 3 / 5 + 20)) && who && (who != target_ptr->riding))
        {
@@ -4034,8 +4034,8 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
        }
 
        /* Player cannot hurt himself */
-       if (!who) return (FALSE);
-       if (who == target_ptr->riding) return (FALSE);
+       if (!who) return FALSE;
+       if (who == target_ptr->riding) return FALSE;
 
        if ((target_ptr->reflect || ((target_ptr->special_defense & KATA_FUUJIN) && !target_ptr->blind)) && (flg & PROJECT_REFLECTABLE) && !one_in_(10))
        {
@@ -4058,7 +4058,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
                                t_y = target_ptr->current_floor_ptr->m_list[who].fy - 1 + randint1(3);
                                t_x = target_ptr->current_floor_ptr->m_list[who].fx - 1 + randint1(3);
                                max_attempts--;
-                       } while (max_attempts && in_bounds2u(target_ptr->current_floor_ptr, t_y, t_x) && !projectable(target_ptr->current_floor_ptr, target_ptr->y, target_ptr->x, t_y, t_x));
+                       } while (max_attempts && in_bounds2u(target_ptr->current_floor_ptr, t_y, t_x) && !projectable(target_ptr, target_ptr->y, target_ptr->x, t_y, t_x));
 
                        if (max_attempts < 1)
                        {
@@ -4155,7 +4155,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
        /* Standard damage -- also poisons player */
        case GF_POIS:
        {
-               bool double_resist = IS_OPPOSE_POIS();
+               bool double_resist = is_oppose_pois(target_ptr);
                if (fuzzy) msg_print(_("毒で攻撃された!", "You are hit by poison!"));
 
                if (target_ptr->resist_pois) dam = (dam + 2) / 3;
@@ -4178,7 +4178,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
        /* Standard damage -- also poisons / mutates player */
        case GF_NUKE:
        {
-               bool double_resist = IS_OPPOSE_POIS();
+               bool double_resist = is_oppose_pois(target_ptr);
                if (fuzzy) msg_print(_("放射能で攻撃された!", "You are hit by radiation!"));
 
                if (target_ptr->resist_pois) dam = (2 * dam + 2) / 5;
@@ -4262,7 +4262,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
                        (void)set_stun(target_ptr, target_ptr->stun + plus_stun);
                }
 
-               if (!(target_ptr->resist_fire || IS_OPPOSE_FIRE() || target_ptr->immune_fire))
+               if (!(target_ptr->resist_fire || is_oppose_fire(target_ptr) || target_ptr->immune_fire))
                {
                        inventory_damage(target_ptr, set_acid_destroy, 3);
                }
@@ -4757,7 +4757,7 @@ static bool project_p(MONSTER_IDX who, player_type *target_ptr, concptr who_name
                                (void)set_stun(target_ptr, target_ptr->stun + randint1(15));
                        }
 
-                       if ((!(target_ptr->resist_cold || IS_OPPOSE_COLD())) || one_in_(12))
+                       if ((!(target_ptr->resist_cold || is_oppose_cold(target_ptr))) || one_in_(12))
                        {
                                if (!target_ptr->immune_cold) inventory_damage(target_ptr, set_cold_destroy, 3);
                        }
@@ -5138,10 +5138,10 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
        ax = ABS(dx);
 
        /* Handle adjacent (or identical) grids */
-       if ((ax < 2) && (ay < 2)) return (TRUE);
+       if ((ax < 2) && (ay < 2)) return TRUE;
 
        /* Paranoia -- require "safe" origin */
-       /* if (!in_bounds(floor_ptr, y1, x1)) return (FALSE); */
+       /* if (!in_bounds(floor_ptr, y1, x1)) return FALSE; */
 
        /* Directly South/North */
        if (!dx)
@@ -5151,7 +5151,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
                {
                        for (ty = y1 + 1; ty < y2; ty++)
                        {
-                               if (cave_stop_disintegration(floor_ptr, ty, x1)) return (FALSE);
+                               if (cave_stop_disintegration(floor_ptr, ty, x1)) return FALSE;
                        }
                }
 
@@ -5160,12 +5160,12 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
                {
                        for (ty = y1 - 1; ty > y2; ty--)
                        {
-                               if (cave_stop_disintegration(floor_ptr, ty, x1)) return (FALSE);
+                               if (cave_stop_disintegration(floor_ptr, ty, x1)) return FALSE;
                        }
                }
 
                /* Assume los */
-               return (TRUE);
+               return TRUE;
        }
 
        /* Directly East/West */
@@ -5176,7 +5176,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
                {
                        for (tx = x1 + 1; tx < x2; tx++)
                        {
-                               if (cave_stop_disintegration(floor_ptr, y1, tx)) return (FALSE);
+                               if (cave_stop_disintegration(floor_ptr, y1, tx)) return FALSE;
                        }
                }
 
@@ -5185,12 +5185,12 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
                {
                        for (tx = x1 - 1; tx > x2; tx--)
                        {
-                               if (cave_stop_disintegration(floor_ptr, y1, tx)) return (FALSE);
+                               if (cave_stop_disintegration(floor_ptr, y1, tx)) return FALSE;
                        }
                }
 
                /* Assume los */
-               return (TRUE);
+               return TRUE;
        }
 
        /* Extract some signs */
@@ -5202,7 +5202,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
        {
                if (ay == 2)
                {
-                       if (!cave_stop_disintegration(floor_ptr, y1 + sy, x1)) return (TRUE);
+                       if (!cave_stop_disintegration(floor_ptr, y1 + sy, x1)) return TRUE;
                }
        }
 
@@ -5211,7 +5211,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
        {
                if (ax == 2)
                {
-                       if (!cave_stop_disintegration(floor_ptr, y1, x1 + sx)) return (TRUE);
+                       if (!cave_stop_disintegration(floor_ptr, y1, x1 + sx)) return TRUE;
                }
        }
 
@@ -5246,7 +5246,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
                /* the LOS exactly meets the corner of a tile. */
                while (x2 - tx)
                {
-                       if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+                       if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
 
                        qy += m;
 
@@ -5257,7 +5257,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
                        else if (qy > f2)
                        {
                                ty += sy;
-                               if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+                               if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
                                qy -= f1;
                                tx += sx;
                        }
@@ -5292,7 +5292,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
        /* the LOS exactly meets the corner of a tile. */
        while (y2 - ty)
        {
-               if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+               if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
 
                qx += m;
 
@@ -5303,7 +5303,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
                else if (qx > f2)
                {
                        tx += sx;
-                       if (cave_stop_disintegration(floor_ptr, ty, tx)) return (FALSE);
+                       if (cave_stop_disintegration(floor_ptr, ty, tx)) return FALSE;
                        qx -= f1;
                        ty += sy;
                }
@@ -5322,7 +5322,7 @@ bool in_disintegration_range(floor_type *floor_ptr, POSITION y1, POSITION x1, PO
 /*
  * breath shape
  */
-void breath_shape(floor_type *floor_ptr, u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ)
+void breath_shape(player_type *caster_ptr, u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ)
 {
        POSITION by = y1;
        POSITION bx = x1;
@@ -5333,6 +5333,7 @@ void breath_shape(floor_type *floor_ptr, u16b *path_g, int dist, int *pgrids, PO
        int path_n = 0;
        int mdis = distance(y1, x1, y2, x2) + rad;
 
+       floor_type *floor_ptr = caster_ptr->current_floor_ptr;
        while (bdis <= mdis)
        {
                POSITION x, y;
@@ -5374,7 +5375,7 @@ void breath_shape(floor_type *floor_ptr, u16b *path_g, int dist, int *pgrids, PO
                                        case GF_LITE:
                                        case GF_LITE_WEAK:
                                                /* Lights are stopped by opaque terrains */
-                                               if (!los(floor_ptr, by, bx, y, x)) continue;
+                                               if (!los(caster_ptr, by, bx, y, x)) continue;
                                                break;
                                        case GF_DISINTEGRATE:
                                                /* Disintegration are stopped only by perma-walls */
@@ -5382,7 +5383,7 @@ void breath_shape(floor_type *floor_ptr, u16b *path_g, int dist, int *pgrids, PO
                                                break;
                                        default:
                                                /* Ball explosions are stopped by walls */
-                                               if (!projectable(floor_ptr, by, bx, y, x)) continue;
+                                               if (!projectable(caster_ptr, by, bx, y, x)) continue;
                                                break;
                                        }
 
@@ -5708,8 +5709,8 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
 
        /* Calculate the projection path */
 
-       path_n = project_path(caster_ptr->current_floor_ptr, path_g, (project_length ? project_length : MAX_RANGE), y1, x1, y2, x2, flg);
-       handle_stuff();
+       path_n = project_path(caster_ptr, path_g, (project_length ? project_length : MAX_RANGE), y1, x1, y2, x2, flg);
+       handle_stuff(caster_ptr);
 
        /* Giga-Hack SEEKER & SUPER_RAY */
 
@@ -5799,12 +5800,12 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                                remove_mirror(caster_ptr, y, x);
                                next_mirror(caster_ptr, &oy, &ox, y, x);
 
-                               path_n = i + project_path(caster_ptr->current_floor_ptr, &(path_g[i + 1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
+                               path_n = i + project_path(caster_ptr, &(path_g[i + 1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
                                for (j = last_i; j <= i; j++)
                                {
                                        y = GRID_Y(path_g[j]);
                                        x = GRID_X(path_g[j]);
-                                       if (project_m(caster_ptr, caster_ptr->current_floor_ptr, 0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice = TRUE;
+                                       if (project_m(caster_ptr, 0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice = TRUE;
                                        if (!who && (project_m_n == 1) && !jump) {
                                                if (caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx > 0)
                                                {
@@ -5812,8 +5813,8 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
 
                                                        if (m_ptr->ml)
                                                        {
-                                                               if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-                                                               health_track(caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
+                                                               if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+                                                               health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
                                                        }
                                                }
                                        }
@@ -5830,7 +5831,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                        POSITION py, px;
                        py = GRID_Y(path_g[i]);
                        px = GRID_X(path_g[i]);
-                       if (project_m(caster_ptr, caster_ptr->current_floor_ptr, 0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
+                       if (project_m(caster_ptr, 0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
                                notice = TRUE;
                        if (!who && (project_m_n == 1) && !jump) {
                                if (caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx > 0)
@@ -5839,8 +5840,8 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
 
                                        if (m_ptr->ml)
                                        {
-                                               if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-                                               health_track(caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
+                                               if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+                                               health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
                                        }
                                }
                        }
@@ -5951,14 +5952,14 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
 
                                path_n = i;
                                second_step = i + 1;
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y - 1, x - 1, flg);
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y - 1, x, flg);
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y - 1, x + 1, flg);
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y, x - 1, flg);
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y, x + 1, flg);
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y + 1, x - 1, flg);
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y + 1, x, flg);
-                               path_n += project_path(caster_ptr->current_floor_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y + 1, x + 1, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y - 1, x - 1, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y - 1, x, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y - 1, x + 1, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y, x - 1, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y, x + 1, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y + 1, x - 1, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y + 1, x, flg);
+                               path_n += project_path(caster_ptr, &(path_g[path_n + 1]), (project_length ? project_length : MAX_RANGE), y, x, y + 1, x + 1, flg);
                        }
                }
 
@@ -5966,15 +5967,15 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                {
                        POSITION py = GRID_Y(path_g[i]);
                        POSITION px = GRID_X(path_g[i]);
-                       (void)project_m(caster_ptr, caster_ptr->current_floor_ptr, 0, 0, py, px, dam, GF_SUPER_RAY, flg, TRUE);
+                       (void)project_m(caster_ptr, 0, 0, py, px, dam, GF_SUPER_RAY, flg, TRUE);
                        if (!who && (project_m_n == 1) && !jump) {
                                if (caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx > 0) {
                                        monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx];
 
                                        if (m_ptr->ml)
                                        {
-                                               if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-                                               health_track(caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
+                                               if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+                                               health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[project_m_y][project_m_x].m_idx);
                                        }
                                }
                        }
@@ -6122,7 +6123,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                {
                        flg &= ~(PROJECT_HIDE);
 
-                       breath_shape(caster_ptr->current_floor_ptr, path_g, dist, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, by, bx, typ);
+                       breath_shape(caster_ptr, path_g, dist, &grids, gx, gy, gm, &gm_rad, rad, y1, x1, by, bx, typ);
                }
                else
                {
@@ -6145,7 +6146,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                                                case GF_LITE:
                                                case GF_LITE_WEAK:
                                                        /* Lights are stopped by opaque terrains */
-                                                       if (!los(caster_ptr->current_floor_ptr, by, bx, y, x)) continue;
+                                                       if (!los(caster_ptr, by, bx, y, x)) continue;
                                                        break;
                                                case GF_DISINTEGRATE:
                                                        /* Disintegration are stopped only by perma-walls */
@@ -6153,7 +6154,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                                                        break;
                                                default:
                                                        /* Ball explosions are stopped by walls */
-                                                       if (!projectable(caster_ptr->current_floor_ptr, by, bx, y, x)) continue;
+                                                       if (!projectable(caster_ptr, by, bx, y, x)) continue;
                                                        break;
                                                }
 
@@ -6171,7 +6172,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
        }
 
        /* Speed -- ignore "non-explosions" */
-       if (!grids) return (FALSE);
+       if (!grids) return FALSE;
 
 
        /* Display the "blast area" if requested */
@@ -6250,7 +6251,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
        if (flg & PROJECT_KILL)
        {
                see_s_msg = (who > 0) ? is_seen(&caster_ptr->current_floor_ptr->m_list[who]) :
-                       (!who ? TRUE : (player_can_see_bold(caster_ptr, y1, x1) && projectable(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x, y1, x1)));
+                       (!who ? TRUE : (player_can_see_bold(caster_ptr, y1, x1) && projectable(caster_ptr, caster_ptr->y, caster_ptr->x, y1, x1)));
        }
 
        /* Check features */
@@ -6362,7 +6363,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                                                t_y = y_saver - 1 + randint1(3);
                                                t_x = x_saver - 1 + randint1(3);
                                                max_attempts--;
-                                       } while (max_attempts && in_bounds2u(caster_ptr->current_floor_ptr, t_y, t_x) && !projectable(caster_ptr->current_floor_ptr, y, x, t_y, t_x));
+                                       } while (max_attempts && in_bounds2u(caster_ptr->current_floor_ptr, t_y, t_x) && !projectable(caster_ptr, y, x, t_y, t_x));
 
                                        if (max_attempts < 1)
                                        {
@@ -6394,7 +6395,6 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                                }
                        }
 
-
                        /* Find the closest point in the blast */
                        if (breath)
                        {
@@ -6405,7 +6405,6 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                                effective_dist = dist;
                        }
 
-
                        /* There is the riding player on this monster */
                        if (caster_ptr->riding && player_bold(caster_ptr, y, x))
                        {
@@ -6478,7 +6477,7 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
                        }
 
                        /* Affect the monster in the grid */
-                       if (project_m(caster_ptr, caster_ptr->current_floor_ptr, who, effective_dist, y, x, dam, typ, flg, see_s_msg)) notice = TRUE;
+                       if (project_m(caster_ptr, who, effective_dist, y, x, dam, typ, flg, see_s_msg)) notice = TRUE;
                }
 
 
@@ -6495,14 +6494,13 @@ bool project(player_type *caster_ptr, MONSTER_IDX who, POSITION rad, POSITION y,
 
                                if (m_ptr->ml)
                                {
-                                       if (!caster_ptr->image) monster_race_track(m_ptr->ap_r_idx);
-                                       health_track(caster_ptr->current_floor_ptr->grid_array[y][x].m_idx);
+                                       if (!caster_ptr->image) monster_race_track(caster_ptr, m_ptr->ap_r_idx);
+                                       health_track(caster_ptr, caster_ptr->current_floor_ptr->grid_array[y][x].m_idx);
                                }
                        }
                }
        }
 
-
        /* Check player */
        if (flg & (PROJECT_KILL))
        {
@@ -6635,7 +6633,7 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam)
                                distance(caster_ptr->y, caster_ptr->x, y, x) <= MAX_RANGE &&
                                distance(caster_ptr->y, caster_ptr->x, y, x) != 0 &&
                                player_has_los_bold(caster_ptr, y, x) &&
-                               projectable(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x, y, x))
+                               projectable(caster_ptr, caster_ptr->y, caster_ptr->x, y, x))
                        {
                                mirror_y[mirror_num] = y;
                                mirror_x[mirror_num] = x;
@@ -6686,7 +6684,7 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam)
                                centersign*((point_x[2] - x)*(point_y[0] - y)
                                        - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
-                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x, y, x))
+                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr, caster_ptr->y, caster_ptr->x, y, x))
                                {
                                        /* Visual effects */
                                        if (!(caster_ptr->blind)
@@ -6714,7 +6712,7 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam)
                                centersign*((point_x[2] - x)*(point_y[0] - y)
                                        - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
-                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x, y, x))
+                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr, caster_ptr->y, caster_ptr->x, y, x))
                                {
                                        (void)project_f(caster_ptr, 0, 0, y, x, dam, GF_MANA);
                                }
@@ -6733,7 +6731,7 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam)
                                centersign*((point_x[2] - x)*(point_y[0] - y)
                                        - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
-                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x, y, x))
+                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr, caster_ptr->y, caster_ptr->x, y, x))
                                {
                                        (void)project_o(caster_ptr, 0, 0, y, x, dam, GF_MANA);
                                }
@@ -6752,9 +6750,9 @@ bool binding_field(player_type *caster_ptr, HIT_POINT dam)
                                centersign*((point_x[2] - x)*(point_y[0] - y)
                                        - (point_y[2] - y)*(point_x[0] - x)) >= 0)
                        {
-                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr->current_floor_ptr, caster_ptr->y, caster_ptr->x, y, x))
+                               if (player_has_los_bold(caster_ptr, y, x) && projectable(caster_ptr, caster_ptr->y, caster_ptr->x, y, x))
                                {
-                                       (void)project_m(caster_ptr, caster_ptr->current_floor_ptr, 0, 0, y, x, dam, GF_MANA,
+                                       (void)project_m(caster_ptr, 0, 0, y, x, dam, GF_MANA,
                                                (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP), TRUE);
                                }
                        }
@@ -6784,7 +6782,7 @@ void seal_of_mirror(player_type *caster_ptr, HIT_POINT dam)
                        if (!is_mirror_grid(&caster_ptr->current_floor_ptr->grid_array[y][x]))
                                continue;
                        
-                       if (!project_m(caster_ptr, caster_ptr->current_floor_ptr, 0, 0, y, x, dam, GF_GENOCIDE,
+                       if (!project_m(caster_ptr, 0, 0, y, x, dam, GF_GENOCIDE,
                                (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP), TRUE))
                                continue;