[Refactor] #39068 エンバグを修正しつつ，add_essence() の item_tester_tval グローバル参照をローカル引数に収める．

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

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 66dc18f..e2bf417 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -1,9 +1,20 @@
 #include "angband.h"
+#include "util.h"
+
+#include "player-race.h"
 #include "spells-summon.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "player-effects.h"
+#include "player-class.h"
+#include "spells.h"
 #include "spells-status.h"
+#include "spells-floor.h"
 #include "object-hook.h"
+#include "cmd-basic.h"
+#include "floor.h"
+#include "objectkind.h"
+#include "view-mainwindow.h"
 
 
 
@@ -53,7 +64,7 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
                        const int times = randint1(powerful ? 8 : 4);
                        for (k = 0; k < times; k++)
                        {
-                               if (summon_specific(0, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
+                               if (summon_specific(0, p_ptr->y, p_ptr->x, current_floor_ptr->dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
                                {
                                        ident = TRUE;
                                }
@@ -222,7 +233,7 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
 
                case SV_STAFF_EARTHQUAKES:
                {
-                       if (earthquake(p_ptr->y, p_ptr->x, (powerful ? 15 : 10)))
+                       if (earthquake(p_ptr->y, p_ptr->x, (powerful ? 15 : 10), 0))
                                ident = TRUE;
                        else
                                msg_print(_("ダンジョンが揺れた。", "The dungeon trembles."));
@@ -251,8 +262,8 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
                case SV_STAFF_NOTHING:
                {
                        msg_print(_("何も起らなかった。", "Nothing happen."));
-                       if (prace_is_(RACE_SKELETON) || prace_is_(RACE_GOLEM) ||
-                               prace_is_(RACE_ZOMBIE) || prace_is_(RACE_SPECTRE))
+                       if (PRACE_IS_(RACE_SKELETON) || PRACE_IS_(RACE_GOLEM) ||
+                               PRACE_IS_(RACE_ZOMBIE) || PRACE_IS_(RACE_SPECTRE))
                                msg_print(_("もったいない事をしたような気がする。食べ物は大切にしなくては。", "What a waste.  It's your food!"));
                        break;
                }
@@ -282,7 +293,7 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
        /* Get the item (in the pack) */
        if (item >= 0)
        {
-               o_ptr = &inventory[item];
+               o_ptr = &p_ptr->inventory_list[item];
        }
 
        /* Get the item (on the floor) */
@@ -383,8 +394,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                object_type forge;
                object_type *q_ptr;
                q_ptr = &forge;
-
-               /* Obtain a local object */
                object_copy(q_ptr, o_ptr);
 
                /* Modify quantity */
@@ -435,13 +444,9 @@ void do_cmd_use_staff(void)
                set_action(ACTION_NONE);
        }
 
-       /* Restrict choices to wands */
-       item_tester_tval = TV_STAFF;
-
        q = _("どの杖を使いますか? ", "Use which staff? ");
        s = _("使える杖がない。", "You have no staff to use.");
-
-       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+       if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR), TV_STAFF)) return;
 
        do_cmd_use_staff_aux(item);
 }