From 5bdec642a17367bc793a2afd91b402a6875924cd Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 17 Mar 2019 14:53:55 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=A1?= =?utf8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86=E3=80=82=20/=20Refactor=20c?= =?utf8?q?omments.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/dungeon.c | 10 ---------- src/grid.c | 2 -- src/spells2.c | 22 ---------------------- src/wizard2.c | 4 ---- 4 files changed, 38 deletions(-) diff --git a/src/dungeon.c b/src/dungeon.c index 8dc901a10..3f3f59cd0 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -870,8 +870,6 @@ static void regen_monsters(void) monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Allow regeneration (if needed) */ @@ -2419,8 +2417,6 @@ static void process_world_aux_mutation(void) { monster_type *m_ptr = ¤t_floor_ptr->m_list[monster]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; if (r_ptr->level >= p_ptr->lev) @@ -3082,8 +3078,6 @@ static byte get_dungeon_feeling(void) monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr; int delta = 0; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Ignore pet */ @@ -4993,8 +4987,6 @@ static void process_player(void) monster_race *r_ptr; m_ptr = ¤t_floor_ptr->m_list[m_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Skip unseen monsters */ @@ -5027,8 +5019,6 @@ static void process_player(void) { monster_type *m_ptr; m_ptr = ¤t_floor_ptr->m_list[m_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Nice monsters get mean */ diff --git a/src/grid.c b/src/grid.c index c262c5822..ffbc76bec 100644 --- a/src/grid.c +++ b/src/grid.c @@ -3735,8 +3735,6 @@ void update_mon_lite(void) { m_ptr = ¤t_floor_ptr->m_list[i]; r_ptr = &r_info[m_ptr->r_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Is it too far away? */ diff --git a/src/spells2.c b/src/spells2.c index 4eb42be88..a4aac4611 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -472,8 +472,6 @@ bool detect_monsters_evil(POSITION range) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; y = m_ptr->fy; @@ -528,8 +526,6 @@ bool detect_monsters_nonliving(POSITION range) for (i = 1; i < m_max; i++) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; y = m_ptr->fy; @@ -579,8 +575,6 @@ bool detect_monsters_mind(POSITION range) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; y = m_ptr->fy; @@ -632,8 +626,6 @@ bool detect_monsters_string(POSITION range, concptr Match) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; y = m_ptr->fy; @@ -687,8 +679,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; y = m_ptr->fy; @@ -789,8 +779,6 @@ bool project_all_los(EFFECT_ID typ, HIT_POINT dam) for (i = 1; i < m_max; i++) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; y = m_ptr->fy; @@ -979,8 +967,6 @@ void aggravate_monsters(MONSTER_IDX who) for (i = 1; i < m_max; i++) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Skip aggravating monster (or player) */ @@ -1130,8 +1116,6 @@ bool symbol_genocide(int power, bool player_cast) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Skip "wrong" monsters */ @@ -1171,8 +1155,6 @@ bool mass_genocide(int power, bool player_cast) for (i = 1; i < m_max; i++) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Skip distant monsters */ @@ -1214,8 +1196,6 @@ bool mass_genocide_undead(int power, bool player_cast) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; if (!(r_ptr->flags3 & RF3_UNDEAD)) continue; @@ -1260,8 +1240,6 @@ bool probing(void) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; monster_race *r_ptr = &r_info[m_ptr->r_idx]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Require line of sight */ diff --git a/src/wizard2.c b/src/wizard2.c index 1313f4c69..feb72ae38 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1474,8 +1474,6 @@ static void do_cmd_wiz_zap(void) for (i = 1; i < m_max; i++) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Skip the mount */ @@ -1511,8 +1509,6 @@ static void do_cmd_wiz_zap_all(void) for (i = 1; i < m_max; i++) { monster_type *m_ptr = ¤t_floor_ptr->m_list[i]; - - /* Paranoia -- Skip dead monsters */ if (!monster_is_valid(m_ptr)) continue; /* Skip the mount */ -- 2.11.0