From 8eac788d2306b8093d7404bf729f17acec1d741a Mon Sep 17 00:00:00 2001 From: deskull Date: Fri, 6 Dec 2019 19:58:22 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20revenge=5Fspell()=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=20revenge=5Fspell().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/core.c | 2 +- src/realm-hex.c | 12 ++++++------ src/realm-hex.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core.c b/src/core.c index 8ee240666..143cc5c0d 100644 --- a/src/core.c +++ b/src/core.c @@ -4360,7 +4360,7 @@ static void process_upkeep_with_speed(void) /* Hex - Handle the hex spells */ if (!load) check_hex(p_ptr); - if (!load) revenge_spell(); + if (!load) revenge_spell(p_ptr); /* There is some randomness of needed energy */ p_ptr->enchant_energy_need += ENERGY_NEED(); diff --git a/src/realm-hex.c b/src/realm-hex.c index 9b2ef3ec3..c5b200cb0 100644 --- a/src/realm-hex.c +++ b/src/realm-hex.c @@ -260,15 +260,15 @@ bool hex_spell_fully(void) * @brief 一定ゲームターン毎に復讐処理の残り期間の判定を行う * @return なし */ -void revenge_spell(void) +void revenge_spell(player_type *caster_ptr) { - if (p_ptr->realm1 != REALM_HEX) return; - if (HEX_REVENGE_TURN(p_ptr) <= 0) return; + if (caster_ptr->realm1 != REALM_HEX) return; + if (HEX_REVENGE_TURN(caster_ptr) <= 0) return; - switch(HEX_REVENGE_TYPE(p_ptr)) + switch(HEX_REVENGE_TYPE(caster_ptr)) { - case 1: exe_spell(p_ptr, REALM_HEX, HEX_PATIENCE, SPELL_CONT); break; - case 2: exe_spell(p_ptr, REALM_HEX, HEX_REVENGE, SPELL_CONT); break; + case 1: exe_spell(caster_ptr, REALM_HEX, HEX_PATIENCE, SPELL_CONT); break; + case 2: exe_spell(caster_ptr, REALM_HEX, HEX_REVENGE, SPELL_CONT); break; } } diff --git a/src/realm-hex.h b/src/realm-hex.h index 60894ca52..4c5c9c455 100644 --- a/src/realm-hex.h +++ b/src/realm-hex.h @@ -53,7 +53,7 @@ extern bool stop_hex_spell_all(void); extern bool stop_hex_spell(void); extern void check_hex(player_type *caster_ptr); extern bool hex_spell_fully(void); -extern void revenge_spell(void); +extern void revenge_spell(player_type *caster_ptr); extern void revenge_store(HIT_POINT dam); extern bool teleport_barrier(MONSTER_IDX m_idx); extern bool magic_barrier(MONSTER_IDX m_idx); -- 2.11.0