From 38099636c35aa0da2101590e9f0d68c0d7b9719c Mon Sep 17 00:00:00 2001 From: Deskull Date: Fri, 4 Jan 2019 11:05:25 +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=E3=80=82=20/=20Refactor=20c?= =?utf8?q?omments.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/bldg.c | 6 +----- src/dungeon.c | 6 ------ src/floor-save.c | 5 ----- src/save.c | 6 ------ src/store.c | 23 ++++++----------------- 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/src/bldg.c b/src/bldg.c index e87ab3aa8..22066b3e0 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -4391,10 +4391,7 @@ void do_cmd_bldg(void) p_ptr->oldpx = p_ptr->x; } - /* Forget the lite */ forget_lite(); - - /* Forget the view */ forget_view(); /* Hack -- Increase "icky" depth */ @@ -4502,8 +4499,7 @@ void quest_discovery(QUEST_IDX q_idx) /* Unique */ /* Hack -- "unique" monsters must be "unique" */ - if ((r_ptr->flags1 & RF1_UNIQUE) && - (0 == r_ptr->max_num)) + if ((r_ptr->flags1 & RF1_UNIQUE) && (0 == r_ptr->max_num)) { msg_print(_("この階は以前は誰かによって守られていたようだ…。", "It seems that this level was protected by someone before...")); /* The unique is already dead */ diff --git a/src/dungeon.c b/src/dungeon.c index f8e331847..1ecd73cbe 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -6208,14 +6208,8 @@ void play_game(bool new_game) /* Cancel the health bar */ health_track(0); - - /* Forget the lite */ forget_lite(); - - /* Forget the view */ forget_view(); - - /* Forget the view */ clear_mon_lite(); /* Handle "quit and save" */ diff --git a/src/floor-save.c b/src/floor-save.c index 7677e237e..f2128fcd0 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -1051,13 +1051,8 @@ void leave_floor(void) /* Record the last visit turn of current floor */ sf_ptr->last_visit = turn; - /* Forget the lite */ forget_lite(); - - /* Forget the view */ forget_view(); - - /* Forget the view */ clear_mon_lite(); /* Save current floor */ diff --git a/src/save.c b/src/save.c index 129b6de7d..bf1b59c90 100644 --- a/src/save.c +++ b/src/save.c @@ -1149,20 +1149,14 @@ static bool wr_dungeon(void) saved_floor_type *cur_sf_ptr; int i; - /* Forget the lite */ forget_lite(); - - /* Forget the view */ forget_view(); - - /* Forget the view */ clear_mon_lite(); /* Update lite/view */ p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE); p_ptr->update |= (PU_MONSTERS | PU_DISTANCE | PU_FLOW); - /*** Meta info ***/ /* Number of floor_id used from birth */ diff --git a/src/store.c b/src/store.c index ca43b8a36..c22aaeb8e 100644 --- a/src/store.c +++ b/src/store.c @@ -4601,11 +4601,11 @@ static void store_process_command(void) */ void do_cmd_store(void) { - int which; - int maintain_num; - int i; - cave_type *c_ptr; - bool need_redraw_store_inv; /* To redraw missiles damage and prices in store */ + int which; + int maintain_num; + int i; + cave_type *c_ptr; + bool need_redraw_store_inv; /* To redraw missiles damage and prices in store */ int w, h; /* Get term size */ @@ -4658,24 +4658,15 @@ void do_cmd_store(void) town[p_ptr->town_num].store[which].last_visit = turn; } - /* Forget the lite */ forget_lite(); - - /* Forget the view */ forget_view(); - /* Hack -- Character is in "icky" mode */ character_icky = TRUE; - - /* No command argument */ + /* command reset */ command_arg = 0; - - /* No repeated command */ command_rep = 0; - - /* No automatic command */ command_new = 0; /* Do not expand macros */ @@ -4691,13 +4682,11 @@ void do_cmd_store(void) st_ptr = &town[p_ptr->town_num].store[cur_store_num]; ot_ptr = &owners[cur_store_num][st_ptr->owner]; - /* Start at the beginning */ store_top = 0; play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_BUILD); - /* Display the store */ display_store(); /* Do not leave */ -- 2.11.0