#include "projection.h"
#include "quest.h"
#include "realm-hex.h"
+#include "player-move.h"
+#include "monster.h"
+#include "monster-status.h"
+#include "monster-spell.h"
/*!
* @brief モンスターが敵対モンスターにビームを当てること可能かを判定する /
if (y == y2 && x == x2)
hit2 = TRUE;
else if (is_friend && current_floor_ptr->grid_array[y][x].m_idx > 0 &&
- !are_enemies(m_ptr, &m_list[current_floor_ptr->grid_array[y][x].m_idx]))
+ !are_enemies(m_ptr, ¤t_floor_ptr->m_list[current_floor_ptr->grid_array[y][x].m_idx]))
{
/* Friends don't shoot friends */
return FALSE;
*/
static bool dispel_check_monster(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
{
- monster_type *t_ptr = &m_list[t_idx];
+ monster_type *t_ptr = ¤t_floor_ptr->m_list[t_idx];
- /* Invulnabilty */
if (MON_INVULNER(t_ptr)) return TRUE;
- /* Speed */
if (t_ptr->mspeed < 135)
{
if (MON_FAST(t_ptr)) return TRUE;
char m_poss[160];
#endif
- monster_type *m_ptr = &m_list[m_idx];
+ monster_type *m_ptr = ¤t_floor_ptr->m_list[m_idx];
monster_type *t_ptr = NULL;
monster_race *r_ptr = &r_info[m_ptr->r_idx];
if (pet_t_m_idx && pet)
{
target_idx = pet_t_m_idx;
- t_ptr = &m_list[target_idx];
+ t_ptr = ¤t_floor_ptr->m_list[target_idx];
/* Cancel if not projectable (for now) */
if ((m_idx == target_idx) || !projectable(m_ptr->fy, m_ptr->fx, t_ptr->fy, t_ptr->fx))
if (target_idx)
{
- t_ptr = &m_list[target_idx];
+ t_ptr = ¤t_floor_ptr->m_list[target_idx];
/* Cancel if neither enemy nor a given target */
if ((m_idx == target_idx) ||
if (!dummy) continue;
target_idx = dummy;
- t_ptr = &m_list[target_idx];
+ t_ptr = ¤t_floor_ptr->m_list[target_idx];
- /* Skip dead monsters */
- if (!t_ptr->r_idx) continue;
+ if (!monster_is_valid(t_ptr)) continue;
/* Monster must be 'an enemy' */
if ((m_idx == target_idx) || !are_enemies(m_ptr, t_ptr)) continue;
dam = monspell_to_monster(thrown_spell, y, x, m_idx, target_idx);
if (dam < 0) return FALSE;
- if (m_ptr->ml && maneable && !world_monster && !p_ptr->blind && (p_ptr->pclass == CLASS_IMITATOR))
+ if (m_ptr->ml && maneable && !current_world_ptr->timewalk_m_idx && !p_ptr->blind && (p_ptr->pclass == CLASS_IMITATOR))
{
if (thrown_spell != 167) /* Not RF6_SPECIAL */
{