[Refactor] #define ALLOW_EASY_DISARM による分岐処理削除 / Delete #define branch by ALLOW_EASY_...

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

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index c9b8030..64d2948 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -168,7 +168,6 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
        {
                (void)activate_artifact(o_ptr);
 
-               /* Window stuff */
                p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
                /* Success */
@@ -277,7 +276,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
                else
                {
                        success = FALSE;
-                       if (!get_rep_dir2(&dir)) return;
+                       if (!get_direction(&dir, FALSE, FALSE)) return;
                        if (monster_can_enter(p_ptr->y + ddy[dir], p_ptr->x + ddx[dir], &r_info[o_ptr->pval], 0))
                        {
                                if (place_monster_aux(0, p_ptr->y + ddy[dir], p_ptr->x + ddx[dir], o_ptr->pval, (PM_FORCE_PET | PM_NO_KAGE)))
@@ -376,7 +375,6 @@ void do_cmd_activate(void)
        /* Prepare the hook */
        item_tester_hook = item_tester_hook_activate;
 
-       /* Get an item */
        q = _("どのアイテムを始動させますか? ", "Activate which item? ");
        s = _("始動できるアイテムを装備していない。", "You have nothing to activate.");
 
@@ -1631,7 +1629,7 @@ bool activate_artifact(object_type *o_ptr)
        {
                POSITION x, y;
 
-               if (!get_rep_dir2(&dir)) return FALSE;
+               if (!get_direction(&dir, FALSE, FALSE)) return FALSE;
                y = p_ptr->y + ddy[dir];
                x = p_ptr->x + ddx[dir];
                tsuri_dir = dir;