From 3579be42ba27304b7ba4f6ed9a5a44d329723505 Mon Sep 17 00:00:00 2001 From: deskull Date: Tue, 7 Jan 2020 00:11:38 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20confirm=5Fuse=5Fforce()=20?= =?utf8?q?=E3=81=AB=20floor=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92?= =?utf8?q?=E8=BF=BD=E5=8A=A0=20/=20Added=20floor=5Ftype=20*=20argument=20t?= =?utf8?q?o=20confirm=5Fuse=5Fforce().?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd/cmd-spell.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c index ba8abbdcd..5bae1f91b 100644 --- a/src/cmd/cmd-spell.c +++ b/src/cmd/cmd-spell.c @@ -574,7 +574,7 @@ static int get_spell(player_type *caster_ptr, SPELL_IDX *sn, concptr prompt, OBJ * @param browse_only 魔法と技能の閲覧を行うならばTRUE * @return 魔道書を一冊も持っていないならTRUEを返す */ -static void confirm_use_force(bool browse_only) +static void confirm_use_force(player_type *caster_ptr, bool browse_only) { char which; COMMAND_CODE code; @@ -582,7 +582,7 @@ static void confirm_use_force(bool browse_only) /* Get the item index */ if (repeat_pull(&code) && (code == INVEN_FORCE)) { - browse_only ? do_cmd_mind_browse(p_ptr) : do_cmd_mind(p_ptr); + browse_only ? do_cmd_mind_browse(caster_ptr) : do_cmd_mind(caster_ptr); return; } @@ -607,7 +607,7 @@ static void confirm_use_force(bool browse_only) if (which == 'w') { - browse_only ? do_cmd_mind_browse(p_ptr) : do_cmd_mind(p_ptr); + browse_only ? do_cmd_mind_browse(caster_ptr) : do_cmd_mind(caster_ptr); } } @@ -656,7 +656,7 @@ void do_cmd_browse(player_type *caster_ptr) { if (player_has_no_spellbooks(caster_ptr)) { - confirm_use_force(TRUE); + confirm_use_force(caster_ptr, TRUE); return; } } @@ -1059,7 +1059,7 @@ void do_cmd_cast(player_type *caster_ptr) if (caster_ptr->blind || no_lite(caster_ptr)) { - if (caster_ptr->pclass == CLASS_FORCETRAINER) confirm_use_force(FALSE); + if (caster_ptr->pclass == CLASS_FORCETRAINER) confirm_use_force(caster_ptr, FALSE); else { msg_print(_("目が見えない！", "You cannot see!")); @@ -1085,7 +1085,7 @@ void do_cmd_cast(player_type *caster_ptr) { if (player_has_no_spellbooks(caster_ptr)) { - confirm_use_force(FALSE); + confirm_use_force(caster_ptr, FALSE); return; } } -- 2.11.0