From 1836893b03f0c01746b0cebebd00019c6c663270 Mon Sep 17 00:00:00 2001 From: Deskull Date: Mon, 3 Dec 2018 23:57:22 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=A1?= =?utf8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86=20/=20Refactor=20comments.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/birth.c | 2 -- src/bldg.c | 4 ---- src/cmd-item.c | 2 -- src/cmd-read.c | 2 -- src/cmd4.c | 2 -- src/effects.c | 2 -- src/files.c | 4 ---- src/main-win.c | 2 -- src/object1.c | 13 ------------- src/xtra2.c | 2 -- 10 files changed, 35 deletions(-) diff --git a/src/birth.c b/src/birth.c index 6b76aff21..9d6899442 100644 --- a/src/birth.c +++ b/src/birth.c @@ -508,8 +508,6 @@ static void show_help(cptr helpfile) /* Peruse the help file */ (void)show_file(TRUE, helpfile, NULL, 0, 0); - - /* Load screen */ screen_load(); } diff --git a/src/bldg.c b/src/bldg.c index 61f17a3ab..7a500f89d 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -311,8 +311,6 @@ static void arena_comm(int cmd) /* Peruse the arena help file */ (void)show_file(TRUE, _("arena_j.txt", "arena.txt"), NULL, 0, 0); - - /* Load screen */ screen_load(); break; @@ -2308,8 +2306,6 @@ static void town_history(void) /* Peruse the building help file */ (void)show_file(TRUE, _("jbldg.txt", "bldg.txt"), NULL, 0, 0); - - /* Load screen */ screen_load(); } diff --git a/src/cmd-item.c b/src/cmd-item.c index f384a0688..def0cb5ba 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -66,8 +66,6 @@ void do_cmd_inven(void) /* Get a new command */ command_new = inkey(); - - /* Load screen */ screen_load(); diff --git a/src/cmd-read.c b/src/cmd-read.c index 87be0542c..631dae41b 100644 --- a/src/cmd-read.c +++ b/src/cmd-read.c @@ -546,8 +546,6 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known) /* Peruse the help file */ (void)show_file(TRUE, buf, o_name, 0, 0); - - /* Load screen */ screen_load(); used_up=FALSE; diff --git a/src/cmd4.c b/src/cmd4.c index 8ce640161..c34eb7ab5 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -2965,8 +2965,6 @@ void do_cmd_macros(void) /* Flush messages */ msg_print(NULL); } - - /* Load screen */ screen_load(); } diff --git a/src/effects.c b/src/effects.c index d1dd584cb..071a828d8 100644 --- a/src/effects.c +++ b/src/effects.c @@ -4962,7 +4962,6 @@ bool choose_ele_attack(void) screen_load(); return FALSE; } - /* Load screen */ screen_load(); return TRUE; } @@ -5005,7 +5004,6 @@ bool choose_ele_immune(TIME_EFFECT immune_turn) screen_load(); return FALSE; } - /* Load screen */ screen_load(); return TRUE; } diff --git a/src/files.c b/src/files.c index a7fcf9bb1..cbda30f40 100644 --- a/src/files.c +++ b/src/files.c @@ -5782,8 +5782,6 @@ void do_cmd_help(void) /* Peruse the main help file */ (void)show_file(TRUE, _("jhelp.hlp", "help.hlp"), NULL, 0, 0); - - /* Load screen */ screen_load(); } @@ -6621,8 +6619,6 @@ static void show_info(void) /* Dump a character file */ (void)file_character(out_val); - - /* Load screen */ screen_load(); } diff --git a/src/main-win.c b/src/main-win.c index d31b397a8..2dd6cfab6 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -3914,8 +3914,6 @@ static void process_menus(WORD wCmd) /* Forget the high score fd */ highscore_fd = -1; - - /* Load screen */ screen_load(); /* Hack - Flush it */ diff --git a/src/object1.c b/src/object1.c index 5392afb7c..dca9f716b 100644 --- a/src/object1.c +++ b/src/object1.c @@ -3130,7 +3130,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Hack -- Fix screen */ if (command_see) { - /* Load screen */ screen_load(); screen_save(); } @@ -3210,8 +3209,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) { /* Flip flag */ command_see = FALSE; - - /* Load screen */ screen_load(); } @@ -3238,7 +3235,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Hack -- Fix screen */ if (command_see) { - /* Load screen */ screen_load(); screen_save(); } @@ -3472,7 +3468,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Fix the screen if necessary */ if (command_see) { - /* Load screen */ screen_load(); /* Hack -- Cancel "display" */ @@ -4275,7 +4270,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Hack -- Fix screen */ if (command_see) { - /* Load screen */ screen_load(); screen_save(); } @@ -4334,7 +4328,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Hack -- Fix screen */ if (command_see) { - /* Load screen */ screen_load(); screen_save(); } @@ -4415,8 +4408,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) { /* Flip flag */ command_see = FALSE; - - /* Load screen */ screen_load(); } @@ -4464,7 +4455,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Hack -- Fix screen */ if (command_see) { - /* Load screen */ screen_load(); screen_save(); } @@ -4512,7 +4502,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Hack -- Fix screen */ if (command_see) { - /* Load screen */ screen_load(); screen_save(); } @@ -4562,7 +4551,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Hack -- Fix screen */ if (command_see) { - /* Load screen */ screen_load(); screen_save(); } @@ -4826,7 +4814,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Fix the screen if necessary */ if (command_see) { - /* Load screen */ screen_load(); /* Hack -- Cancel "display" */ diff --git a/src/xtra2.c b/src/xtra2.c index 9a0f433cd..e1d685678 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -3211,8 +3211,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info) /* Wait */ query = inkey(); - - /* Load screen */ screen_load(); /* Exit unless 'Enter' */ -- 2.11.0