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

diff --git a/src/autopick.c b/src/autopick.c
index e4bbfb8..9bcb0e0 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -6139,8 +6139,6 @@ void do_cmd_edit_autopick(void)
 
                if (com_id) quit = do_editor_command(tb, com_id);
        } /* while (TRUE) */
-
-       /* Restore the screen */
        screen_load();
 
        /* Get the filename of preference */

diff --git a/src/bldg.c b/src/bldg.c
index 2f46883..cb7e586 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -2823,8 +2823,6 @@ static PRICE compare_weapons(PRICE bcost)
                        break;
                }
        }
-
-       /* Restore the screen */
        screen_load();
 
        return (total);

diff --git a/src/cave.c b/src/cave.c
index f56d30b..159b4c7 100644 (file)
--- a/src/cave.c
+++ b/src/cave.c
@@ -2252,8 +2252,6 @@ void do_cmd_view_map(void)
                /* Get any key */
                inkey();
        }
-
-       /* Restore the screen */
        screen_load();
 }
 

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 646a90c..dab81e0 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -132,8 +132,6 @@ void do_cmd_equip(void)
 
        /* Get a new command */
        command_new = inkey();
-
-       /* Restore the screen */
        screen_load();
 
 

diff --git a/src/cmd-magiceat.c b/src/cmd-magiceat.c
index 1265348..218591a 100644 (file)
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -387,9 +387,7 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
                        {
                                /* Hide list */
                                request_list = FALSE;
-                               
-                               /* Restore the screen */
-                               screen_load();
+                                                               screen_load();
                                screen_save();
                        }
                        else
@@ -487,8 +485,6 @@ static OBJECT_SUBTYPE_VALUE select_magic_eater(bool only_browse)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        screen_load();
 
        if (!flag) return -1;

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index 4c2dea2..c409c93 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -801,8 +801,6 @@ void do_cmd_pet(void)
                                {
                                        /* Hide list */
                                        redraw = FALSE;
-
-                                       /* Restore the screen */
                                        screen_load();
                                }
 
@@ -842,8 +840,6 @@ void do_cmd_pet(void)
                        /* Stop the loop */
                        flag = TRUE;
                }
-
-               /* Restore the screen */
                if (redraw) screen_load();
 
                /* Abort if needed */

diff --git a/src/cmd4.c b/src/cmd4.c
index 882d220..e41b732 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -941,8 +941,6 @@ void do_cmd_nikki(void)
 
                msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -1092,8 +1090,6 @@ void do_cmd_change_name(void)
 
                msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
 
        /* Redraw everything */
@@ -1344,8 +1340,6 @@ void do_cmd_messages(int num_now)
                /* Hack -- Error of some kind */
                if (i == j) bell();
        }
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -2271,8 +2265,6 @@ void do_cmd_options(void)
                msg_erase();
        }
 
-
-       /* Restore the screen */
        screen_load();
 
        /* Hack - Redraw equippy chars */
@@ -3569,8 +3561,6 @@ void do_cmd_visuals(void)
 
                msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
 
        if (need_redraw) do_cmd_redraw();
@@ -3785,8 +3775,6 @@ void do_cmd_colors(void)
                msg_erase();
        }
 
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -4672,8 +4660,6 @@ void do_cmd_load_screen(void)
        flush();
        inkey();
 
-
-       /* Restore the screen */
        screen_load();
 }
 
@@ -5002,8 +4988,6 @@ void do_cmd_save_screen_html_aux(char *filename, int message)
                msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
                msg_print(NULL);
        }
-
-       /* Restore the screen */
        if (message)
                screen_load();
 }
@@ -5160,14 +5144,11 @@ void do_cmd_save_screen(void)
                /* Skip a line */
                fprintf(fff, "\n");
 
-
                /* Close it */
                my_fclose(fff);
 
                msg_print(_("画面(記念撮影)をファイルに書き出しました。", "Screen dump saved."));
                msg_print(NULL);
-
-               /* Restore the screen */
                screen_load();
        }
 
@@ -8475,8 +8456,6 @@ void do_cmd_knowledge(void)
 
                msg_erase();
        }
-
-       /* Restore the screen */
        screen_load();
 
        if (need_redraw) do_cmd_redraw();
@@ -8494,8 +8473,6 @@ void do_cmd_checkquest(void)
 
        /* Quest info */
        do_cmd_knowledge_quests();
-
-       /* Restore the screen */
        screen_load();
 }
 

diff --git a/src/cmd5.c b/src/cmd5.c
index 56d12ef..416f837 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -210,8 +210,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
 
                                        /* Hide list */
                                        redraw = FALSE;
-
-                                       /* Restore the screen */
                                        screen_load();
                                }
 
@@ -300,8 +298,6 @@ static int get_spell(SPELL_IDX *sn, cptr prompt, OBJECT_SUBTYPE_VALUE sval, bool
                flag = TRUE;
        }
 
-
-       /* Restore the screen */
        if (redraw) screen_load();
 
        p_ptr->window |= (PW_SPELL);
@@ -544,8 +540,6 @@ void do_cmd_browse(void)
                                prt(_("読める呪文がない。", "No spells to browse."), 0, 0);
                        (void)inkey();
 
-
-                       /* Restore the screen */
                        screen_load();
 
                        return;
@@ -565,8 +559,6 @@ void do_cmd_browse(void)
                        line++;
                }
        }
-
-       /* Restore the screen */
        screen_load();
 }
 

diff --git a/src/hissatsu.c b/src/hissatsu.c
index ed50a59..ad6256b 100644 (file)
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -233,8 +233,6 @@ static int get_hissatsu_power(SPELL_IDX *sn)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -287,8 +285,6 @@ static int get_hissatsu_power(SPELL_IDX *sn)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw) screen_load();
 
        p_ptr->window |= (PW_SPELL);

diff --git a/src/mane.c b/src/mane.c
index 69b51b3..19e4a37 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -193,8 +193,6 @@ static int get_mane_power(int *sn, bool baigaesi)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -236,8 +234,6 @@ static int get_mane_power(int *sn, bool baigaesi)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw) screen_load();
 
        p_ptr->window |= (PW_SPELL);

diff --git a/src/mind.c b/src/mind.c
index 76daf0c..5bb826f 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -947,8 +947,6 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -993,8 +991,6 @@ static bool_hack get_mind_power(SPELL_IDX *sn, bool only_browse)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw && !only_browse) screen_load();
 
        p_ptr->window |= (PW_SPELL);

diff --git a/src/mspells3.c b/src/mspells3.c
index 2033606..8642a2f 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -509,8 +509,6 @@ static bool get_learned_power(SPELL_IDX *sn)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -555,8 +553,6 @@ static bool get_learned_power(SPELL_IDX *sn)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw) screen_load();
 
        p_ptr->window |= (PW_SPELL);

diff --git a/src/object1.c b/src/object1.c
index 22aa44d..75f4a22 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1281,8 +1281,6 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode)
        prt(_("[何かキーを押すとゲームに戻ります]", "[Press any key to continue]"), k, 15);
 
        inkey();
-
-       /* Restore the screen */
        screen_load();
 
        /* Gave knowledge */

diff --git a/src/object2.c b/src/object2.c
index 990b5f1..e854766 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -8072,8 +8072,6 @@ static void add_essence(ESSENCE_IDX mode)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -8115,8 +8113,6 @@ static void add_essence(ESSENCE_IDX mode)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw) screen_load();
 
        if (!flag) return;

diff --git a/src/racial.c b/src/racial.c
index a0f778c..c1e0722 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -2650,8 +2650,6 @@ if (!repeat_pull(&i) || i<0 || i>=num) {
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                screen_load();
                        }
 
@@ -2707,8 +2705,6 @@ if (!repeat_pull(&i) || i<0 || i>=num) {
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw) screen_load();
 
        /* Abort if needed */

diff --git a/src/selfinfo.c b/src/selfinfo.c
index 8fcfc76..feddd4e 100644 (file)
--- a/src/selfinfo.c
+++ b/src/selfinfo.c
@@ -1600,8 +1600,6 @@ void self_knowledge(void)
        /* Pause */\r
        prt(_("[何かキーを押すとゲームに戻ります]", "[Press any key to continue]"), k, 13);\r
        inkey();\r
-\r
-       /* Restore the screen */\r
        screen_load();\r
 }\r
 \r
@@ -1807,7 +1805,5 @@ void report_magics(void)
        /* Pause */\r
        prt(_("[何かキーを押すとゲームに戻ります]", "[Press any key to continue]"), k, 13);\r
        inkey();\r
-\r
-       /* Restore the screen */\r
        screen_load();\r
 }\r

diff --git a/src/snipe.c b/src/snipe.c
index a7d2bad..e2a93f2 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -337,8 +337,6 @@ static int get_snipe_power(COMMAND_CODE *sn, bool only_browse)
                        {
                                /* Hide list */
                                redraw = FALSE;
-
-                               /* Restore the screen */
                                if (!only_browse) screen_load();
                        }
 
@@ -381,8 +379,6 @@ static int get_snipe_power(COMMAND_CODE *sn, bool only_browse)
                /* Stop the loop */
                flag = TRUE;
        }
-
-       /* Restore the screen */
        if (redraw && !only_browse) screen_load();
 
        p_ptr->window |= (PW_SPELL);

diff --git a/src/wizard1.c b/src/wizard1.c
index c0d58e0..88439b9 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -2472,7 +2472,6 @@ void do_cmd_spoilers(void)
                {
                /* Escape */
                case ESCAPE:
-                       /* Restore the screen */
                        screen_load();
                        return;
 

diff --git a/src/wizard2.c b/src/wizard2.c
index 38ac08b..ffbc44e 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1328,8 +1328,6 @@ static void do_cmd_wiz_play(void)
                }
        }
 
-
-       /* Restore the screen */
        screen_load();
 
 
@@ -1389,7 +1387,6 @@ static void wiz_create_item(void)
        /* Get object base type */
        k_idx = wiz_create_itemtype();
 
-       /* Restore the screen */
        screen_load();
 
        /* Return if failed */

diff --git a/src/xtra2.c b/src/xtra2.c
index 593b872..67f739b 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1895,7 +1895,6 @@ bool change_panel(POSITION dy, POSITION dx)
                panel_bounds_center();
 
                p_ptr->update |= (PU_MONSTERS);
-
                p_ptr->redraw |= (PR_MAP);
                handle_stuff();