[Refactor] #39068 choose_object() の item_tester_tval グローバル参照をローカル引数に収める．(一部バグを起こしている可...

[hengband/hengband.git] / src / cmd-zapwand.c

diff --git a/src/cmd-zapwand.c b/src/cmd-zapwand.c
index 3942073..01cf109 100644 (file)
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -6,6 +6,7 @@
 #include "spells-status.h"
 #include "player-status.h"
 #include "player-effects.h"
+#include "player-class.h"
 #include "objectkind.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
@@ -460,10 +461,6 @@ void do_cmd_aim_wand(void)
 
        if (p_ptr->wild_mode) return;
        if (cmd_limit_arena(p_ptr)) return;
-
-       /* Restrict choices to wands */
-       item_tester_tval = TV_WAND;
-
        if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
        {
                set_action(ACTION_NONE);
@@ -471,7 +468,7 @@ void do_cmd_aim_wand(void)
 
        q = _("どの魔法棒で狙いますか? ", "Aim which wand? ");
        s = _("使える魔法棒がない。", "You have no wand to aim.");
-       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_WAND)) return;
 
        do_cmd_aim_wand_aux(item);
 }