From 6bcef1af63ba7d4ac843324e2d531ce18834df12 Mon Sep 17 00:00:00 2001 From: deskull Date: Thu, 21 Nov 2019 20:58:22 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20do=5Fcmd=5Fwiz=5Fzap()=20?= =?utf8?q?=E3=81=AB=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=EF=BC=8E=20/=20Add=20player=5Ftype=20*=20argu?= =?utf8?q?ment=20to=20do=5Fcmd=5Fwiz=5Fzap().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/wizard2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wizard2.c b/src/wizard2.c index a31dac343..cc027e8a2 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1453,18 +1453,18 @@ static void do_cmd_wiz_named_friendly(player_type *summoner_ptr, MONRACE_IDX r_i * Hack -- Delete all nearby monsters * @return なし */ -static void do_cmd_wiz_zap(void) +static void do_cmd_wiz_zap(player_type *caster_ptr) { MONSTER_IDX i; /* Genocide everyone nearby */ - for (i = 1; i < p_ptr->current_floor_ptr->m_max; i++) + for (i = 1; i < caster_ptr->current_floor_ptr->m_max; i++) { - monster_type *m_ptr = &p_ptr->current_floor_ptr->m_list[i]; + monster_type *m_ptr = &caster_ptr->current_floor_ptr->m_list[i]; if (!monster_is_valid(m_ptr)) continue; /* Skip the mount */ - if (i == p_ptr->riding) continue; + if (i == caster_ptr->riding) continue; /* Delete nearby monsters */ if (m_ptr->cdis <= MAX_SIGHT) @@ -1474,7 +1474,7 @@ static void do_cmd_wiz_zap(void) GAME_TEXT m_name[MAX_NLEN]; monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE); - exe_write_diary(p_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name); + exe_write_diary(caster_ptr, NIKKI_NAMED_PET, RECORD_NAMED_PET_WIZ_ZAP, m_name); } delete_monster_idx(i); @@ -1926,7 +1926,7 @@ void do_cmd_debug(player_type *creature_ptr) /* Zap Monsters (Genocide) */ case 'z': - do_cmd_wiz_zap(); + do_cmd_wiz_zap(creature_ptr); break; /* Zap Monsters (Omnicide) */ -- 2.11.0