From 15d3e52034e240cc87463ba1426e05106c1d9a5e Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 6 Dec 2018 23:55:48 +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/bldg.c | 4 --- src/cmd-item.c | 2 -- src/cmd1.c | 4 --- src/cmd2.c | 2 -- src/effects.c | 94 ---------------------------------------------------------- src/files.c | 6 ---- src/spells3.c | 2 -- src/store.c | 14 --------- src/wizard2.c | 2 -- src/xtra2.c | 22 -------------- 10 files changed, 152 deletions(-) diff --git a/src/bldg.c b/src/bldg.c index 18f32b08b..f8d99754b 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -1911,8 +1911,6 @@ static bool kankin(void) /* Auto-inscription */ autopick_alter_item(item_new, FALSE); - - /* Handle stuff */ handle_stuff(); change = TRUE; @@ -4499,8 +4497,6 @@ void do_cmd_bldg(void) /* Notice stuff */ notice_stuff(); - - /* Handle stuff */ handle_stuff(); } diff --git a/src/cmd-item.c b/src/cmd-item.c index 0499aa9b3..e59448529 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -1521,8 +1521,6 @@ void do_cmd_locate(void) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); - - /* Handle stuff */ handle_stuff(); } diff --git a/src/cmd1.c b/src/cmd1.c index 76b1d3298..65800e587 100644 --- a/src/cmd1.c +++ b/src/cmd1.c @@ -556,8 +556,6 @@ void carry(bool pickup) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD); - - /* Handle stuff */ handle_stuff(); /* Automatically pickup/destroy/inscribe items */ @@ -895,8 +893,6 @@ bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode) /* For get everything when requested hehe I'm *NASTY* */ if (dun_level && (d_info[dungeon_type].flags1 & DF1_FORGET)) wiz_dark(); - - /* Handle stuff */ if (mpe_mode & MPE_HANDLE_STUFF) handle_stuff(); if (p_ptr->pclass == CLASS_NINJA) diff --git a/src/cmd2.c b/src/cmd2.c index 2d516464c..24bf08767 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -2214,8 +2214,6 @@ void do_cmd_rest(void) /* Redraw the state */ p_ptr->redraw |= (PR_STATE); - - /* Handle stuff */ handle_stuff(); /* Refresh */ diff --git a/src/effects.c b/src/effects.c index 071a828d8..5f391f32d 100644 --- a/src/effects.c +++ b/src/effects.c @@ -423,8 +423,6 @@ bool set_blind(TIME_EFFECT v) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -511,8 +509,6 @@ bool set_confused(TIME_EFFECT v) if (!notice) return (FALSE); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -562,8 +558,6 @@ bool set_poisoned(TIME_EFFECT v) if (!notice) return (FALSE); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -627,8 +621,6 @@ bool set_afraid(TIME_EFFECT v) if (!notice) return (FALSE); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -687,8 +679,6 @@ bool set_paralyzed(TIME_EFFECT v) /* Redraw the state */ p_ptr->redraw |= (PR_STATE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -755,8 +745,6 @@ bool set_image(TIME_EFFECT v) p_ptr->update |= (PU_MONSTERS); p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -812,8 +800,6 @@ bool set_fast(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -871,8 +857,6 @@ bool set_lightspeed(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -926,8 +910,6 @@ bool set_slow(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -985,8 +967,6 @@ bool set_shield(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1044,8 +1024,6 @@ bool set_tsubureru(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1103,8 +1081,6 @@ bool set_magicdef(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1161,8 +1137,6 @@ bool set_blessed(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1223,8 +1197,6 @@ bool set_hero(TIME_EFFECT v, bool do_dec) /* Recalculate hitpoints */ p_ptr->update |= (PU_HP); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1285,8 +1257,6 @@ bool set_shero(TIME_EFFECT v, bool do_dec) /* Recalculate hitpoints */ p_ptr->update |= (PU_HP); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1340,8 +1310,6 @@ bool set_protevil(TIME_EFFECT v, bool do_dec) if (!notice) return (FALSE); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1416,8 +1384,6 @@ bool set_wraith_form(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); @@ -1496,8 +1462,6 @@ bool set_invuln(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1555,8 +1519,6 @@ bool set_tim_esp(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); p_ptr->update |= (PU_MONSTERS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1616,8 +1578,6 @@ bool set_tim_invis(TIME_EFFECT v, bool do_dec) /* Update the monsters */ p_ptr->update |= (PU_MONSTERS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1677,8 +1637,6 @@ bool set_tim_infra(TIME_EFFECT v, bool do_dec) /* Update the monsters */ p_ptr->update |= (PU_MONSTERS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1735,8 +1693,6 @@ bool set_tim_regen(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1793,8 +1749,6 @@ bool set_tim_stealth(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1908,8 +1862,6 @@ bool set_tim_levitation(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -1963,8 +1915,6 @@ bool set_tim_sh_touki(TIME_EFFECT v, bool do_dec) if (!notice) return (FALSE); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2021,8 +1971,6 @@ bool set_tim_sh_fire(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2079,8 +2027,6 @@ bool set_tim_sh_holy(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2137,8 +2083,6 @@ bool set_tim_eyeeye(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2196,8 +2140,6 @@ bool set_resist_magic(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2254,8 +2196,6 @@ bool set_tim_reflect(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2310,8 +2250,6 @@ bool set_multishadow(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2368,8 +2306,6 @@ bool set_dustrobe(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2426,8 +2362,6 @@ bool set_kabenuke(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2493,8 +2427,6 @@ bool set_tsuyoshi(TIME_EFFECT v, bool do_dec) /* Recalculate hitpoints */ p_ptr->update |= (PU_HP); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2571,8 +2503,6 @@ bool set_ele_attack(u32b attack_type, TIME_EFFECT v) p_ptr->redraw |= (PR_STATUS); p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); @@ -2650,8 +2580,6 @@ bool set_ele_immune(u32b immune_type, TIME_EFFECT v) p_ptr->redraw |= (PR_STATUS); p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); @@ -2706,8 +2634,6 @@ bool set_oppose_acid(TIME_EFFECT v, bool do_dec) p_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2761,8 +2687,6 @@ bool set_oppose_elec(TIME_EFFECT v, bool do_dec) p_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2817,8 +2741,6 @@ bool set_oppose_fire(TIME_EFFECT v, bool do_dec) p_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2872,8 +2794,6 @@ bool set_oppose_cold(TIME_EFFECT v, bool do_dec) p_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -2928,8 +2848,6 @@ bool set_oppose_pois(TIME_EFFECT v, bool do_dec) p_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(FALSE, FALSE); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -3086,8 +3004,6 @@ bool set_stun(TIME_EFFECT v) /* Redraw the "stun" */ p_ptr->redraw |= (PR_STUN); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -3283,8 +3199,6 @@ bool set_cut(TIME_EFFECT v) /* Redraw the "cut" */ p_ptr->redraw |= (PR_CUT); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -3481,8 +3395,6 @@ bool set_food(TIME_EFFECT v) /* Redraw hunger */ p_ptr->redraw |= (PR_HUNGER); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -4787,8 +4699,6 @@ bool set_ultimate_res(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -4839,8 +4749,6 @@ bool set_tim_res_nether(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } @@ -4891,8 +4799,6 @@ bool set_tim_res_time(TIME_EFFECT v, bool do_dec) /* Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); return (TRUE); } diff --git a/src/files.c b/src/files.c index cbda30f40..f27b2dad6 100644 --- a/src/files.c +++ b/src/files.c @@ -6100,8 +6100,6 @@ void do_cmd_save_game(int is_autosave) /* Clear messages */ msg_print(NULL); - - /* Handle stuff */ handle_stuff(); prt(_("ゲームをセーブしています...", "Saving game..."), 0, 0); @@ -6584,8 +6582,6 @@ static void show_info(void) /* Hack -- Recalculate bonuses */ p_ptr->update |= (PU_BONUS); - - /* Handle stuff */ handle_stuff(); /* Flush all input keys */ @@ -6781,8 +6777,6 @@ void close_game(void) bool do_send = TRUE; /* cptr p = "[i:キャラクタの情報, f:ファイル書き出し, t:スコア, x:*鑑定*, ESC:ゲーム終了]"; */ - - /* Handle stuff */ handle_stuff(); /* Flush the messages */ diff --git a/src/spells3.c b/src/spells3.c index 48974ff28..b57db376d 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -2620,8 +2620,6 @@ bool identify_fully(bool only_equip) /* Mark the item as fully known */ o_ptr->ident |= (IDENT_MENTAL); - - /* Handle stuff */ handle_stuff(); object_desc(o_name, o_ptr, 0); diff --git a/src/store.c b/src/store.c index 145311d62..98aa6e4cd 100644 --- a/src/store.c +++ b/src/store.c @@ -3668,8 +3668,6 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price); { o_ptr->pval -= j_ptr->pval; } - - /* Handle stuff */ handle_stuff(); /* Note how many slots the store used to have */ @@ -3782,8 +3780,6 @@ msg_format("%sを $%ldで購入しました。", o_name, (long)price); msg_format("You have %s (%c).", #endif o_name, index_to_label(item_new)); - - /* Handle stuff */ handle_stuff(); /* Take note if we take the last one */ @@ -4104,8 +4100,6 @@ msg_format("%sを $%ldで売却しました。", o_name, (long)price); autopick_alter_item(item, FALSE); inven_item_optimize(item); - - /* Handle stuff */ handle_stuff(); /* The store gets that (known) item */ @@ -4166,8 +4160,6 @@ msg_format("%sを $%ldで売却しました。", o_name, (long)price); inven_item_increase(item, -amt); inven_item_describe(item); inven_item_optimize(item); - - /* Handle stuff */ handle_stuff(); /* Let the home carry it */ @@ -4197,8 +4189,6 @@ msg_format("%sを $%ldで売却しました。", o_name, (long)price); inven_item_increase(item, -amt); inven_item_describe(item); inven_item_optimize(item); - - /* Handle stuff */ handle_stuff(); /* Let the home carry it */ @@ -4959,8 +4949,6 @@ void do_cmd_store(void) /* Notice stuff */ notice_stuff(); - - /* Handle stuff */ handle_stuff(); /* Pack Overflow */ @@ -5041,8 +5029,6 @@ void do_cmd_store(void) inven_item_increase(item, -255); inven_item_describe(item); inven_item_optimize(item); - - /* Handle stuff */ handle_stuff(); /* Let the home carry it */ diff --git a/src/wizard2.c b/src/wizard2.c index 5949c2778..94514ec84 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -74,8 +74,6 @@ void do_cmd_rerate(bool display) p_ptr->redraw |= (PR_HP); p_ptr->window |= (PW_PLAYER); - - /* Handle stuff */ handle_stuff(); if (display) diff --git a/src/xtra2.c b/src/xtra2.c index 5d27096bc..ef0e19455 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -49,8 +49,6 @@ void check_experience(void) /* Redraw experience */ p_ptr->redraw |= (PR_EXP); - - /* Handle stuff */ handle_stuff(); @@ -68,8 +66,6 @@ void check_experience(void) p_ptr->redraw |= (PR_LEV | PR_TITLE); p_ptr->window |= (PW_PLAYER); - - /* Handle stuff */ handle_stuff(); } @@ -114,8 +110,6 @@ void check_experience(void) /* HPとMPの上昇量を表示 */ level_up = 1; - - /* Handle stuff */ handle_stuff(); level_up = 0; @@ -203,8 +197,6 @@ void check_experience(void) p_ptr->redraw |= (PR_LEV | PR_TITLE); p_ptr->window |= (PW_PLAYER | PW_SPELL); - - /* Handle stuff */ handle_stuff(); } @@ -2088,8 +2080,6 @@ bool change_panel(POSITION dy, POSITION dx) p_ptr->update |= (PU_MONSTERS); p_ptr->redraw |= (PR_MAP); - - /* Handle stuff */ handle_stuff(); /* Success */ @@ -3600,8 +3590,6 @@ bool target_set(BIT_FLAGS mode) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD); - - /* Handle stuff */ handle_stuff(); /* Recalculate interesting grids */ @@ -3690,8 +3678,6 @@ bool target_set(BIT_FLAGS mode) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD); - - /* Handle stuff */ handle_stuff(); /* Recalculate interesting grids */ @@ -3808,8 +3794,6 @@ bool target_set(BIT_FLAGS mode) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD); - - /* Handle stuff */ handle_stuff(); /* Recalculate interesting grids */ @@ -3932,8 +3916,6 @@ bool target_set(BIT_FLAGS mode) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD); - - /* Handle stuff */ handle_stuff(); /* Failure to set target */ @@ -5084,8 +5066,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD); - - /* Handle stuff */ handle_stuff(); } else /* move cursor to next stair and change panel */ @@ -5172,8 +5152,6 @@ bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr) p_ptr->redraw |= (PR_MAP); p_ptr->window |= (PW_OVERHEAD); - - /* Handle stuff */ handle_stuff(); *x_ptr = x; -- 2.11.0