From bd23dab5010eee32b843ffabf83d10cbdbc9fe9d Mon Sep 17 00:00:00 2001 From: Deskull Date: Fri, 23 Nov 2018 19:29:13 +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 | 2 -- src/cmd-item.c | 2 -- src/cmd2.c | 7 ------- src/cmd4.c | 1 - src/flavor.c | 1 - src/monster1.c | 1 - src/monster2.c | 2 -- src/object-hook.c | 1 - src/object2.c | 4 ---- src/rooms-pitnest.c | 15 --------------- src/save.c | 2 -- src/store.c | 1 - src/xtra2.c | 2 -- 13 files changed, 41 deletions(-) diff --git a/src/bldg.c b/src/bldg.c index cd2d3b36b..59443e18b 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -1465,7 +1465,6 @@ static bool vault_aux_battle(MONRACE_IDX r_idx) } if (!dam && !(r_ptr->flags4 & (RF4_BOLT_MASK | RF4_BEAM_MASK | RF4_BALL_MASK | RF4_BREATH_MASK)) && !(r_ptr->a_ability_flags1 & (RF5_BOLT_MASK | RF5_BEAM_MASK | RF5_BALL_MASK | RF5_BREATH_MASK)) && !(r_ptr->a_ability_flags2 & (RF6_BOLT_MASK | RF6_BEAM_MASK | RF6_BALL_MASK | RF6_BREATH_MASK))) return (FALSE); - /* Okay */ return (TRUE); } @@ -4749,6 +4748,5 @@ QUEST_IDX random_quest_number(DEPTH level) } } - /* Nope */ return 0; } diff --git a/src/cmd-item.c b/src/cmd-item.c index f762723fb..ce67a2055 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -629,7 +629,6 @@ void do_cmd_takeoff(void) { msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed.")); - /* Nope */ return; } @@ -712,7 +711,6 @@ void do_cmd_drop(void) if ((item >= INVEN_RARM) && object_is_cursed(o_ptr)) { msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed.")); - /* Nope */ return; } diff --git a/src/cmd2.c b/src/cmd2.c index 39fd57932..9b1faf42a 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -1018,7 +1018,6 @@ static bool do_cmd_tunnel_test(POSITION y, POSITION x) { msg_print(_("そこには何も見当たらない。", "You see nothing there.")); - /* Nope */ return (FALSE); } @@ -1027,11 +1026,9 @@ static bool do_cmd_tunnel_test(POSITION y, POSITION x) { msg_print(_("そこには掘るものが見当たらない。", "You see nothing there to tunnel.")); - /* Nope */ return (FALSE); } - /* Okay */ return (TRUE); } @@ -1280,7 +1277,6 @@ bool easy_open_door(POSITION y, POSITION x) /* Must be a closed door */ if (!is_closed_door(c_ptr->feat)) { - /* Nope */ return (FALSE); } @@ -3500,13 +3496,11 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken) o_ptr = &o_list[0 - item]; } - /* Item is cursed */ if (object_is_cursed(o_ptr) && (item >= INVEN_RARM)) { msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed.")); - /* Nope */ return FALSE; } @@ -3517,7 +3511,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken) msg_print(_("アリーナではアイテムを使えない！", "You're in the arena now. This is hand-to-hand!")); msg_print(NULL); - /* Nope */ return FALSE; } diff --git a/src/cmd4.c b/src/cmd4.c index e0ca13e55..d7e068bbf 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -1265,7 +1265,6 @@ void do_cmd_messages(int num_now) } else strcpy(shower_str, back_str); - /* Okay */ continue; /* Hack -- handle find */ diff --git a/src/flavor.c b/src/flavor.c index 36fff3d24..d60607592 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -65,7 +65,6 @@ static bool object_easy_know(int i) } } - /* Nope */ return (FALSE); } diff --git a/src/monster1.c b/src/monster1.c index 26e0d962c..ae5a39af1 100644 --- a/src/monster1.c +++ b/src/monster1.c @@ -1700,7 +1700,6 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode) #endif } - /* Okay */ else { p = NULL; diff --git a/src/monster2.c b/src/monster2.c index da24c7883..6e01834ed 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -3595,7 +3595,6 @@ static bool place_monster_can_escort(MONRACE_IDX r_idx) if ((r_ptr->flags7 & RF7_CHAMELEON) && !(z_ptr->flags7 & RF7_CHAMELEON)) return FALSE; - /* Okay */ return (TRUE); } @@ -3909,7 +3908,6 @@ bool alloc_monster(POSITION dis, BIT_FLAGS mode) } #endif /* MONSTER_HORDES */ - /* Nope */ return (FALSE); } diff --git a/src/object-hook.c b/src/object-hook.c index 2c1e97ae0..26acff28e 100644 --- a/src/object-hook.c +++ b/src/object-hook.c @@ -435,6 +435,5 @@ bool item_tester_hook_recharge(object_type *o_ptr) /* Hack -- Recharge rods */ if (o_ptr->tval == TV_ROD) return (TRUE); - /* Nope */ return (FALSE); } diff --git a/src/object2.c b/src/object2.c index d486eb35c..2f3f2a566 100644 --- a/src/object2.c +++ b/src/object2.c @@ -4005,7 +4005,6 @@ static bool item_monster_okay(MONRACE_IDX r_idx) if (r_ptr->flags1 & RF1_FORCE_DEPTH) return (FALSE); if (r_ptr->flags7 & RF7_UNIQUE2) return (FALSE); - /* Okay */ return (TRUE); } @@ -5241,7 +5240,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION by = ty; bx = tx; - /* Okay */ flag = TRUE; } } @@ -5282,7 +5280,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION /* Require floor space */ if (!cave_drop_bold(by, bx)) continue; - /* Okay */ flag = TRUE; } @@ -5963,7 +5960,6 @@ bool inven_carry_okay(object_type *o_ptr) if (object_similar(j_ptr, o_ptr)) return (TRUE); } - /* Nope */ return (FALSE); } diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c index efb7c68ac..769c9a88d 100644 --- a/src/rooms-pitnest.c +++ b/src/rooms-pitnest.c @@ -69,7 +69,6 @@ static u32b vault_aux_dragon_mask4; */ static bool vault_aux_simple(MONRACE_IDX r_idx) { - /* Okay */ return (vault_monster_okay(r_idx)); } @@ -95,7 +94,6 @@ static bool vault_aux_jelly(MONRACE_IDX r_idx) /* Require icky thing, jelly, mold, or mushroom */ if (!my_strchr("ijm,", r_ptr->d_char)) return (FALSE); - /* Okay */ return (TRUE); } @@ -115,7 +113,6 @@ static bool vault_aux_animal(MONRACE_IDX r_idx) /* Require "animal" flag */ if (!(r_ptr->flags3 & (RF3_ANIMAL))) return (FALSE); - /* Okay */ return (TRUE); } @@ -136,7 +133,6 @@ static bool vault_aux_undead(MONRACE_IDX r_idx) /* Require Undead */ if (!(r_ptr->flags3 & (RF3_UNDEAD))) return (FALSE); - /* Okay */ return (TRUE); } @@ -190,7 +186,6 @@ static bool vault_aux_kennel(MONRACE_IDX r_idx) /* Require a Zephyr Hound or a dog */ if (!my_strchr("CZ", r_ptr->d_char)) return (FALSE); - /* Okay */ return (TRUE); } @@ -210,7 +205,6 @@ static bool vault_aux_mimic(MONRACE_IDX r_idx) /* Require mimic */ if (!my_strchr("!$&(/=?[\\|", r_ptr->d_char)) return (FALSE); - /* Okay */ return (TRUE); } @@ -249,7 +243,6 @@ static bool vault_aux_symbol_e(MONRACE_IDX r_idx) /* Decline incorrect symbol */ if (r_ptr->d_char != vault_aux_char) return (FALSE); - /* Okay */ return (TRUE); } @@ -274,7 +267,6 @@ static bool vault_aux_symbol_g(MONRACE_IDX r_idx) /* Decline incorrect symbol */ if (r_ptr->d_char != vault_aux_char) return (FALSE); - /* Okay */ return (TRUE); } @@ -298,7 +290,6 @@ static bool vault_aux_orc(MONRACE_IDX r_idx) /* Decline undead */ if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - /* Okay */ return (TRUE); } @@ -322,7 +313,6 @@ static bool vault_aux_troll(MONRACE_IDX r_idx) /* Decline undead */ if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - /* Okay */ return (TRUE); } @@ -348,7 +338,6 @@ static bool vault_aux_giant(MONRACE_IDX r_idx) /* Decline undead */ if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - /* Okay */ return (TRUE); } @@ -375,7 +364,6 @@ static bool vault_aux_dragon(MONRACE_IDX r_idx) /* Decline undead */ if (r_ptr->flags3 & RF3_UNDEAD) return (FALSE); - /* Okay */ return (TRUE); } @@ -398,7 +386,6 @@ static bool vault_aux_demon(MONRACE_IDX r_idx) /* Require demon */ if (!(r_ptr->flags3 & RF3_DEMON)) return (FALSE); - /* Okay */ return (TRUE); } @@ -421,7 +408,6 @@ static bool vault_aux_cthulhu(MONRACE_IDX r_idx) /* Require eldritch horror */ if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return (FALSE); - /* Okay */ return (TRUE); } @@ -1233,7 +1219,6 @@ static bool vault_aux_trapped_pit(MONRACE_IDX r_idx) /* No wall passing monster */ if (r_ptr->flags2 & (RF2_PASS_WALL | RF2_KILL_WALL)) return (FALSE); - /* Okay */ return (TRUE); } diff --git a/src/save.c b/src/save.c index 3ec0f5f32..f5b87bf71 100644 --- a/src/save.c +++ b/src/save.c @@ -1853,7 +1853,6 @@ bool load_player(void) #endif - /* Okay */ if (!err) { /* Open the savefile */ @@ -1932,7 +1931,6 @@ bool load_player(void) #endif - /* Okay */ if (!err) { /* Give a conversion warning */ diff --git a/src/store.c b/src/store.c index 31fa96e24..c73eabf6e 100644 --- a/src/store.c +++ b/src/store.c @@ -3971,7 +3971,6 @@ static void store_sell(void) #endif - /* Nope */ return; } diff --git a/src/xtra2.c b/src/xtra2.c index 990e9cc8c..a512bf948 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -2800,7 +2800,6 @@ static bool target_set_accept(POSITION y, POSITION x) if (have_flag(f_info[get_feat_mimic(c_ptr)].flags, FF_NOTICE)) return TRUE; } - /* Nope */ return (FALSE); } @@ -5046,7 +5045,6 @@ static bool tgt_pt_accept(POSITION y, POSITION x) if (cave_have_flag_grid(c_ptr, FF_QUEST_EXIT)) return (TRUE); } - /* Nope */ return (FALSE); } -- 2.11.0