[Refactor] #37353 コメント整理。 / Refactor comments.

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

diff --git a/src/cmd-read.c b/src/cmd-read.c
index 348df86..d492ad3 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -8,6 +8,7 @@
 \r
 #include "angband.h"\r
 #include "object-hook.h"\r
+#include "spells-summon.h"\r
 \r
 /*!\r
  * @brief 巻物を読むコマンドのサブルーチン\r
@@ -41,7 +42,6 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
        }\r
 \r
 \r
-       /* Take a turn */\r
        p_ptr->energy_use = 100;\r
 \r
        if (world_player)\r
@@ -118,7 +118,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
                {\r
                        for (k = 0; k < randint1(3); k++)\r
                        {\r
-                               if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))\r
+                               if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))\r
                                {\r
                                        ident = TRUE;\r
                                }\r
@@ -130,7 +130,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
                {\r
                        for (k = 0; k < randint1(3); k++)\r
                        {\r
-                               if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))\r
+                               if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))\r
                                {\r
                                        ident = TRUE;\r
                                }\r
@@ -140,7 +140,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
 \r
                case SV_SCROLL_SUMMON_PET:\r
                {\r
-                       if (summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_FORCE_PET)))\r
+                       if (summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_FORCE_PET), '\0'))\r
                        {\r
                                ident = TRUE;\r
                        }\r
@@ -533,10 +533,8 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
        else if (o_ptr->tval==TV_PARCHMENT)\r
        {\r
                cptr q;\r
-               char o_name[MAX_NLEN];\r
+               GAME_TEXT o_name[MAX_NLEN];\r
                char buf[1024];\r
-\r
-               /* Save screen */\r
                screen_save();\r
 \r
                q=format("book-%d_jp.txt",o_ptr->sval);\r
@@ -549,8 +547,6 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
 \r
                /* Peruse the help file */\r
                (void)show_file(TRUE, buf, o_name, 0, 0);\r
-\r
-               /* Load screen */\r
                screen_load();\r
 \r
                used_up=FALSE;\r
@@ -577,7 +573,6 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
                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
@@ -643,7 +638,6 @@ void do_cmd_read_scroll(void)
        /* Restrict choices to scrolls */\r
        item_tester_hook = item_tester_hook_readable;\r
 \r
-       /* Get an item */\r
        q = _("どの巻物を読みますか? ", "Read which scroll? ");\r
        s = _("読める巻物がない。", "You have no scrolls to read.");\r
 \r