[Refactor] #37353 symbol_genocide()無効時のメッセージ追加。 / Add message when symbol_genocide...

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

diff --git a/src/cmd-usestaff.c b/src/cmd-usestaff.c
index 9fe7a53..1205bda 100644 (file)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -232,21 +232,13 @@ int staff_effect(OBJECT_SUBTYPE_VALUE sval, bool *use_charge, bool powerful, boo
 \r
        case SV_STAFF_HOLINESS:\r
        {\r
-               if (dispel_evil(powerful ? 225 : 150)) ident = TRUE;\r
-               k = 3 * lev;\r
-               if (set_protevil((magic ? 0 : p_ptr->protevil) + randint1(25) + k, FALSE)) ident = TRUE;\r
-               if (set_poisoned(0)) ident = TRUE;\r
-               if (set_afraid(0)) ident = TRUE;\r
-               if (hp_player(50)) ident = TRUE;\r
-               if (set_stun(0)) ident = TRUE;\r
-               if (set_cut(0)) ident = TRUE;\r
+               if (cleansing_nova(p_ptr, magic, powerful)) ident = TRUE;\r
                break;\r
        }\r
 \r
        case SV_STAFF_GENOCIDE:\r
        {\r
-               (void)symbol_genocide((magic ? lev + 50 : 200), TRUE);\r
-               ident = TRUE;\r
+               ident = symbol_genocide((magic ? lev + 50 : 200), TRUE);\r
                break;\r
        }\r
 \r