[Version] 2.2.1.6.

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

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 461e2f8..8d1e8d8 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -15,8 +15,8 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
 {\r
        int k;\r
        int ident = FALSE;\r
-       int lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;\r
-       int detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT;\r
+       PLAYER_LEVEL lev = powerful ? p_ptr->lev * 2 : p_ptr->lev;\r
+       POSITION detect_rad = powerful ? DETECT_RAD_DEFAULT * 3 / 2 : DETECT_RAD_DEFAULT;\r
 \r
        /* Analyze the staff */\r
        switch (sval)\r
@@ -80,15 +80,6 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
                bool result = powerful ? remove_all_curse() : remove_curse();\r
                if (result)\r
                {\r
-                       if (magic)\r
-                       {\r
-                               msg_print(_("誰かに見守られているような気がする。", "You feel as if someone is watching over you."));\r
-                       }\r
-                       else if (!p_ptr->blind)\r
-                       {\r
-                               msg_print(_("杖は一瞬ブルーに輝いた...", "The staff glows blue for a moment..."));\r
-\r
-                       }\r
                        ident = TRUE;\r
                }\r
                break;\r
@@ -349,7 +340,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
        }\r
 \r
 \r
-       /* Take a turn */\r
        p_ptr->energy_use = 100;\r
 \r
        /* Extract the item level */\r
@@ -427,7 +417,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);\r
        }\r
 \r
-       /* Window stuff */\r
        p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);\r
 \r
 \r
@@ -461,7 +450,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
                p_ptr->total_weight -= q_ptr->weight;\r
                item = inven_carry(q_ptr);\r
 \r
-               /* Message */\r
                msg_print(_("杖をまとめなおした。", "You unstack your staff."));\r
        }\r
 \r
@@ -495,7 +483,6 @@ void do_cmd_use_staff(void)
        /* Restrict choices to wands */\r
        item_tester_tval = TV_STAFF;\r
 \r
-       /* Get an item */\r
        q = _("どの杖を使いますか? ", "Use which staff? ");\r
        s = _("使える杖がない。", "You have no staff to use.");\r
 \r