[Refactor] #37353 staff_effect()整理。 / Refactor staff_effect().

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 1205bda..a97a724 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -213,26 +213,25 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
 \r
        case SV_STAFF_PROBING:\r
        {\r
-               probing();\r
-               ident = TRUE;\r
+               ident = probing();\r
                break;\r
        }\r
 \r
        case SV_STAFF_DISPEL_EVIL:\r
        {\r
-               if (dispel_evil(powerful ? 120 : 80)) ident = TRUE;\r
+               ident = dispel_evil(powerful ? 120 : 80);\r
                break;\r
        }\r
 \r
        case SV_STAFF_POWER:\r
        {\r
-               if (dispel_monsters(powerful ? 225 : 150)) ident = TRUE;\r
+               ident = dispel_monsters(powerful ? 225 : 150) ;\r
                break;\r
        }\r
 \r
        case SV_STAFF_HOLINESS:\r
        {\r
-               if (cleansing_nova(p_ptr, magic, powerful)) ident = TRUE;\r
+               ident = cleansing_nova(p_ptr, magic, powerful);\r
                break;\r
        }\r
 \r
@@ -254,17 +253,13 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
 \r
        case SV_STAFF_DESTRUCTION:\r
        {\r
-               if (destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE))\r
-                       ident = TRUE;\r
-\r
+               ident = destroy_area(p_ptr->y, p_ptr->x, (powerful ? 18 : 13) + randint0(5), FALSE);\r
                break;\r
        }\r
 \r
        case SV_STAFF_ANIMATE_DEAD:\r
        {\r
-               if (animate_dead(0, p_ptr->y, p_ptr->x))\r
-                       ident = TRUE;\r
-\r
+               ident = animate_dead(0, p_ptr->y, p_ptr->x);\r
                break;\r
        }\r
 \r