From b432d47a77501caaa2f046ca6b26be47ede22250 Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 22 Dec 2019 12:32:16 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20monspell=5Fto=5Fplayer()?= =?utf8?q?=20=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=20monspell=5Fto=5Fplayer().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/monster-spell.h | 2 +- src/mspells1.c | 2 +- src/mspells4.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/monster-spell.h b/src/monster-spell.h index 0eeddc02b..da33ff64d 100644 --- a/src/monster-spell.h +++ b/src/monster-spell.h @@ -327,7 +327,7 @@ extern void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS /* mspells4.c */ extern bool spell_learnable(MONSTER_IDX m_idx); -extern HIT_POINT monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx); +extern HIT_POINT monspell_to_player(int SPELL_NUM, player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx); extern HIT_POINT monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t_idx); extern HIT_POINT monspell_damage(int SPELL_NUM, MONSTER_IDX m_idx, int TYPE); extern HIT_POINT monspell_race_damage(int SPELL_NUM, MONRACE_IDX r_idx, int TYPE); diff --git a/src/mspells1.c b/src/mspells1.c index 769478170..6a9145f33 100644 --- a/src/mspells1.c +++ b/src/mspells1.c @@ -1772,7 +1772,7 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr) } /* Cast the spell. */ - dam = monspell_to_player(thrown_spell, y, x, m_idx); + dam = monspell_to_player(thrown_spell, target_ptr, y, x, m_idx); if (dam < 0) return FALSE; if ((target_ptr->action == ACTION_LEARN) && thrown_spell > 175) diff --git a/src/mspells4.c b/src/mspells4.c index fcf52a12c..1f56dfcfc 100644 --- a/src/mspells4.c +++ b/src/mspells4.c @@ -3404,13 +3404,13 @@ void spell_RF6_S_UNIQUE(POSITION y, POSITION x, MONSTER_IDX m_idx, MONSTER_IDX t * @param m_idx 呪文を唱えるモンスターID * @return 攻撃呪文のダメージ、または召喚したモンスターの数を返す。その他の場合0。以降の処理を中断するなら-1を返す。 */ -HIT_POINT monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx) +HIT_POINT monspell_to_player(int SPELL_NUM, player_type *target_ptr, POSITION y, POSITION x, MONSTER_IDX m_idx) { switch (SPELL_NUM) { - case RF4_SPELL_START + 0: spell_RF4_SHRIEK(m_idx, p_ptr, 0, MONSTER_TO_PLAYER); break; /* RF4_SHRIEK */ + case RF4_SPELL_START + 0: spell_RF4_SHRIEK(m_idx, target_ptr, 0, MONSTER_TO_PLAYER); break; /* RF4_SHRIEK */ case RF4_SPELL_START + 1: break; /* RF4_XXX1 */ - case RF4_SPELL_START + 2: spell_RF4_DISPEL(m_idx, p_ptr, 0, MONSTER_TO_PLAYER); break; /* RF4_DISPEL */ + case RF4_SPELL_START + 2: spell_RF4_DISPEL(m_idx, target_ptr, 0, MONSTER_TO_PLAYER); break; /* RF4_DISPEL */ case RF4_SPELL_START + 3: return spell_RF4_ROCKET(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_ROCKET */ case RF4_SPELL_START + 4: return spell_RF4_SHOOT(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF4_SHOOT */ case RF4_SPELL_START + 5: break; /* RF4_XXX2 */ @@ -3467,11 +3467,11 @@ HIT_POINT monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX case RF5_SPELL_START + 24: return spell_RF5_BO_PLAS(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_PLAS */ case RF5_SPELL_START + 25: return spell_RF5_BO_ICEE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_BO_ICEE */ case RF5_SPELL_START + 26: return spell_RF5_MISSILE(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF5_MISSILE */ - case RF5_SPELL_START + 27: spell_RF5_SCARE(m_idx, p_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_SCARE */ - case RF5_SPELL_START + 28: spell_RF5_BLIND(m_idx, p_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_BLIND */ - case RF5_SPELL_START + 29: spell_RF5_CONF(m_idx, p_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_CONF */ - case RF5_SPELL_START + 30: spell_RF5_SLOW(m_idx, p_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_SLOW */ - case RF5_SPELL_START + 31: spell_RF5_HOLD(m_idx, p_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_HOLD */ + case RF5_SPELL_START + 27: spell_RF5_SCARE(m_idx, target_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_SCARE */ + case RF5_SPELL_START + 28: spell_RF5_BLIND(m_idx, target_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_BLIND */ + case RF5_SPELL_START + 29: spell_RF5_CONF(m_idx, target_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_CONF */ + case RF5_SPELL_START + 30: spell_RF5_SLOW(m_idx, target_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_SLOW */ + case RF5_SPELL_START + 31: spell_RF5_HOLD(m_idx, target_ptr, 0, MONSTER_TO_PLAYER); break; /* RF5_HOLD */ case RF6_SPELL_START + 0: spell_RF6_HASTE(m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_HASTE */ case RF6_SPELL_START + 1: return spell_RF6_HAND_DOOM(y, x, m_idx, 0, MONSTER_TO_PLAYER); /* RF6_HAND_DOOM */ case RF6_SPELL_START + 2: spell_RF6_HEAL(m_idx, 0, MONSTER_TO_PLAYER); break; /* RF6_HEAL */ -- 2.11.0