[Refactor] #37353 混沌の戦士のレイシャル「幻惑の光」を confusing_light() に分離。 / Separate Chaos warrior...

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

diff --git a/src/cmd-read.c b/src/cmd-read.c
index 1a20b4e..911fbd6 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -9,6 +9,9 @@
 #include "angband.h"\r
 #include "object-hook.h"\r
 #include "spells-summon.h"\r
+#include "artifact.h"\r
+#include "avatar.h"\r
+#include "player-status.h"\r
 \r
 /*!\r
  * @brief 巻物を読むコマンドのサブルーチン\r
@@ -104,12 +107,12 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
                case SV_SCROLL_CURSE_WEAPON:\r
                {\r
                        k = 0;\r
-                       if (buki_motteruka(INVEN_RARM))\r
+                       if (has_melee_weapon(INVEN_RARM))\r
                        {\r
                                k = INVEN_RARM;\r
-                               if (buki_motteruka(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;\r
+                               if (has_melee_weapon(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;\r
                        }\r
-                       else if (buki_motteruka(INVEN_LARM)) k = INVEN_LARM;\r
+                       else if (has_melee_weapon(INVEN_LARM)) k = INVEN_LARM;\r
                        if (k && curse_weapon(FALSE, k)) ident = TRUE;\r
                        break;\r
                }\r
@@ -185,7 +188,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
 \r
                case SV_SCROLL_WORD_OF_RECALL:\r
                {\r
-                       if (!word_of_recall()) used_up = FALSE;\r
+                       if (!recall_player(p_ptr, randint0(21) + 15)) used_up = FALSE;\r
                        ident = TRUE;\r
                        break;\r
                }\r
@@ -532,7 +535,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
        }\r
        else if (o_ptr->tval==TV_PARCHMENT)\r
        {\r
-               cptr q;\r
+               concptr q;\r
                GAME_TEXT o_name[MAX_NLEN];\r
                char buf[1024];\r
                screen_save();\r
@@ -610,7 +613,7 @@ void do_cmd_read_scroll(void)
 {\r
        object_type *o_ptr;\r
        OBJECT_IDX item;\r
-       cptr q, s;\r
+       concptr q, s;\r
 \r
        if (p_ptr->wild_mode)\r
        {\r