if (flg & PROJECT_DISI)
{
if (in_disintegration_range(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
- if (in_disintegration_range(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+ if (in_disintegration_range(y1, x1, p_ptr->y, p_ptr->x) && (distance(y1, x1, p_ptr->y, p_ptr->x) <= rad)) hityou = TRUE;
}
else if (flg & PROJECT_LOS)
{
if (los(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
- if (los(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+ if (los(y1, x1, p_ptr->y, p_ptr->x) && (distance(y1, x1, p_ptr->y, p_ptr->x) <= rad)) hityou = TRUE;
}
else
{
if (projectable(y1, x1, y2, x2) && (distance(y1, x1, y2, x2) <= rad)) hit2 = TRUE;
- if (projectable(y1, x1, py, px) && (distance(y1, x1, py, px) <= rad)) hityou = TRUE;
+ if (projectable(y1, x1, p_ptr->y, p_ptr->x) && (distance(y1, x1, p_ptr->y, p_ptr->x) <= rad)) hityou = TRUE;
}
}
else
{
int y = 0, x = 0;
int i, k, t_idx = 0;
- int thrown_spell, count = 0;
+ int thrown_spell;
int dam = 0;
int start;
int plus = 1;
- int rad = 0; //For elemental balls
byte spell[96], num = 0;
&& (!p_ptr->inside_quest || is_fixed_quest_idx(p_ptr->inside_quest));
bool can_use_lite_area = FALSE;
-
bool can_remember;
- bool resists_tele = FALSE;
-
/* Cannot cast spells when confused */
if (MON_CONFUSED(m_ptr)) return (FALSE);
/* Extract the racial spell flags */
f4 = r_ptr->flags4;
- f5 = r_ptr->flags5;
- f6 = r_ptr->flags6;
+ f5 = r_ptr->a_ability_flags1;
+ f6 = r_ptr->a_ability_flags2;
/* Target is given for pet? */
if (pet_t_m_idx && pet)
get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, 0L);
- if (projectable(real_y, real_x, py, px))
+ if (projectable(real_y, real_x, p_ptr->y, p_ptr->x))
{
- int dist = distance(real_y, real_x, py, px);
+ int dist = distance(real_y, real_x, p_ptr->y, p_ptr->x);
if (dist <= 2)
{
}
else if (f5 & RF5_BA_LITE)
{
- if ((distance(real_y, real_x, py, px) <= 4) && los(real_y, real_x, py, px))
+ if ((distance(real_y, real_x, p_ptr->y, p_ptr->x) <= 4) && los(real_y, real_x, p_ptr->y, p_ptr->x))
f5 &= ~(RF5_BA_LITE);
}
}
int real_x = x;
get_project_point(m_ptr->fy, m_ptr->fx, &real_y, &real_x, PROJECT_STOP);
- if (projectable(real_y, real_x, py, px) && (distance(real_y, real_x, py, px) <= 2))
+ if (projectable(real_y, real_x, p_ptr->y, p_ptr->x) && (distance(real_y, real_x, p_ptr->y, p_ptr->x) <= 2))
f4 &= ~(RF4_ROCKET);
}