From: Deskull Date: Sun, 25 Nov 2018 13:43:41 +0000 (+0900) Subject: [Refactor] #37353 コメント整理 / Refactor comments. X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=1bc973e09f8817cb729bc248da50c95f8656b4bc;hp=76936a075e45fe9c304be2ba009c3b31696748f6 [Refactor] #37353 コメント整理 / Refactor comments. --- diff --git a/src/cmd2.c b/src/cmd2.c index c7c33a56a..3f6da2866 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -491,8 +491,6 @@ static bool do_cmd_open_chest(POSITION y, POSITION x, OBJECT_IDX o_idx) /* Let the Chest drop items */ chest_death(FALSE, y, x, o_idx); } - - /* Result */ return (more); } @@ -723,8 +721,6 @@ static bool do_cmd_open_aux(POSITION y, POSITION x) sound(SOUND_OPENDOOR); } - - /* Result */ return (more); } @@ -887,8 +883,6 @@ static bool do_cmd_close_aux(POSITION y, POSITION x) } } } - - /* Result */ return (more); } @@ -1134,8 +1128,6 @@ static bool do_cmd_tunnel_aux(POSITION y, POSITION x) /* Occasional Search XXX XXX */ if (randint0(100) < 25) search(); } - - /* Result */ return more; } @@ -1316,8 +1308,6 @@ bool easy_open_door(POSITION y, POSITION x) sound(SOUND_OPENDOOR); } - - /* Result */ return (TRUE); } @@ -1399,8 +1389,6 @@ static bool do_cmd_disarm_chest(POSITION y, POSITION x, OBJECT_IDX o_idx) sound(SOUND_FAIL); chest_trap(y, x, o_idx); } - - /* Result */ return (more); } @@ -1485,8 +1473,6 @@ bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir) /* Move the player onto the trap */ move_player(dir, easy_disarm, FALSE); } - - /* Result */ return (more); } @@ -1683,8 +1669,6 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir) /* Hack -- Lose balance ala paralysis */ (void)set_paralyzed(p_ptr->paralyzed + 2 + randint0(2)); } - - /* Result */ return (more); } diff --git a/src/effects.c b/src/effects.c index 4d92ea2ad..824dd3b13 100644 --- a/src/effects.c +++ b/src/effects.c @@ -348,8 +348,6 @@ bool set_mimic(TIME_EFFECT v, IDX p, bool do_dec) p_ptr->update |= (PU_BONUS | PU_HP); handle_stuff(); - - /* Result */ return (TRUE); } @@ -430,8 +428,6 @@ bool set_blind(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -520,8 +516,6 @@ bool set_confused(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -573,8 +567,6 @@ bool set_poisoned(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -640,8 +632,6 @@ bool set_afraid(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -702,8 +692,6 @@ bool set_paralyzed(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -773,8 +761,6 @@ bool set_image(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -832,8 +818,6 @@ bool set_fast(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -893,8 +877,6 @@ bool set_lightspeed(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -950,8 +932,6 @@ bool set_slow(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1011,8 +991,6 @@ bool set_shield(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1072,8 +1050,6 @@ bool set_tsubureru(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1133,8 +1109,6 @@ bool set_magicdef(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1193,8 +1167,6 @@ bool set_blessed(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1257,8 +1229,6 @@ bool set_hero(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1321,8 +1291,6 @@ bool set_shero(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1378,8 +1346,6 @@ bool set_protevil(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1458,8 +1424,6 @@ bool set_wraith_form(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1542,8 +1506,6 @@ bool set_invuln(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1605,8 +1567,6 @@ bool set_tim_esp(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1668,8 +1628,6 @@ bool set_tim_invis(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1731,8 +1689,6 @@ bool set_tim_infra(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1791,8 +1747,6 @@ bool set_tim_regen(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1851,8 +1805,6 @@ bool set_tim_stealth(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -1910,8 +1862,6 @@ bool set_superstealth(bool set) p_ptr->redraw |= (PR_STATUS); if (disturb_state) disturb(FALSE, FALSE); - - /* Result */ return (TRUE); } @@ -1970,8 +1920,6 @@ bool set_tim_levitation(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2027,8 +1975,6 @@ bool set_tim_sh_touki(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2087,8 +2033,6 @@ bool set_tim_sh_fire(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2147,8 +2091,6 @@ bool set_tim_sh_holy(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2207,8 +2149,6 @@ bool set_tim_eyeeye(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2268,8 +2208,6 @@ bool set_resist_magic(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2328,8 +2266,6 @@ bool set_tim_reflect(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2386,8 +2322,6 @@ bool set_multishadow(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2446,8 +2380,6 @@ bool set_dustrobe(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2506,8 +2438,6 @@ bool set_kabenuke(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2575,8 +2505,6 @@ bool set_tsuyoshi(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2790,8 +2718,6 @@ bool set_oppose_acid(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2847,8 +2773,6 @@ bool set_oppose_elec(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2905,8 +2829,6 @@ bool set_oppose_fire(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -2962,8 +2884,6 @@ bool set_oppose_cold(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -3020,8 +2940,6 @@ bool set_oppose_pois(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -3180,8 +3098,6 @@ bool set_stun(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -3379,8 +3295,6 @@ bool set_cut(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -3579,8 +3493,6 @@ bool set_food(TIME_EFFECT v) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -4890,8 +4802,6 @@ bool set_ultimate_res(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -4944,8 +4854,6 @@ bool set_tim_res_nether(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } @@ -4998,8 +4906,6 @@ bool set_tim_res_time(TIME_EFFECT v, bool do_dec) /* Handle stuff */ handle_stuff(); - - /* Result */ return (TRUE); } diff --git a/src/files.c b/src/files.c index 1851a97c0..2d6461076 100644 --- a/src/files.c +++ b/src/files.c @@ -1036,8 +1036,6 @@ cptr process_pref_file_expr(char **sp, char *fp) /* Save */ (*sp) = s; - - /* Result */ return (v); } @@ -1188,8 +1186,6 @@ static errr process_pref_file_aux(cptr name, int preftype) /* Close the file */ my_fclose(fp); - - /* Result */ return (err); } @@ -7106,8 +7102,6 @@ errr process_autopick_file(cptr name) path_build(buf, sizeof(buf), ANGBAND_DIR_USER, name); err = process_pref_file_aux(buf, PREF_TYPE_AUTOPICK); - - /* Result */ return (err); } @@ -7134,8 +7128,6 @@ errr process_histpref_file(cptr name) err = process_pref_file_aux(buf, PREF_TYPE_HISTPREF); character_xtra = old_character_xtra; - - /* Result */ return (err); } diff --git a/src/flavor.c b/src/flavor.c index d60607592..efabbc442 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -366,8 +366,6 @@ static char *object_desc_chr(char *t, char c) /* Terminate */ *t = '\0'; - - /* Result */ return (t); } @@ -387,8 +385,6 @@ static char *object_desc_str(char *t, cptr s) /* Terminate */ *t = '\0'; - - /* Result */ return (t); } @@ -423,8 +419,6 @@ static char *object_desc_num(char *t, uint n) /* Terminate */ *t = '\0'; - - /* Result */ return (t); } @@ -587,8 +581,6 @@ static char *object_desc_int(char *t, sint v) /* Terminate */ *t = '\0'; - - /* Result */ return (t); } diff --git a/src/init1.c b/src/init1.c index 09c0db867..ce6bb63d2 100644 --- a/src/init1.c +++ b/src/init1.c @@ -4766,8 +4766,6 @@ static cptr process_dungeon_file_expr(char **sp, char *fp) /* Save */ (*sp) = s; - - /* Result */ return (v); } @@ -4865,8 +4863,6 @@ errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax) /* Close the file */ my_fclose(fp); - - /* Result */ return (err); } diff --git a/src/load.c b/src/load.c index ab44d09a3..d727611b8 100644 --- a/src/load.c +++ b/src/load.c @@ -4026,8 +4026,6 @@ errr rd_savefile_new(void) /* Close the file */ my_fclose(fff); - - /* Result */ return (err); } @@ -4203,7 +4201,5 @@ bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode) /* Restore old knowledge */ kanji_code = old_kanji_code; - - /* Result */ return ok; } diff --git a/src/main-win.c b/src/main-win.c index 2a46051b7..fa3e060d4 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -899,8 +899,6 @@ static char *analyze_font(char *path, int *wp, int *hp) /* Save results */ (*wp) = wid; (*hp) = hgt; - - /* Result */ return (p); } #endif @@ -1786,8 +1784,6 @@ static bool init_graphics(void) /* Graphics available */ current_graphics_mode = arg_graphics; - - /* Result */ return (current_graphics_mode); } #endif /* USE_GRAPHICS */ @@ -1808,8 +1804,6 @@ static bool init_music(void) /* Sound available */ can_use_music = TRUE; } - - /* Result */ return (can_use_music); } @@ -1839,8 +1833,6 @@ static bool init_sound(void) /* Sound available */ can_use_sound = TRUE; } - - /* Result */ return (can_use_sound); } #endif /* USE_SOUND */ diff --git a/src/monster2.c b/src/monster2.c index f60cf8f25..d2051b6d8 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -954,8 +954,6 @@ static bool summon_specific_aux(MONRACE_IDX r_idx) break; } } - - /* Result */ /* Since okay is int, "return (okay);" is not correct. */ return (bool)(okay ? TRUE : FALSE); } @@ -1447,8 +1445,6 @@ MONRACE_IDX get_mon_num(DEPTH level) /* Keep the "best" one */ if (table[i].level < table[j].level) i = j; } - - /* Result */ return (table[i].index); } diff --git a/src/object1.c b/src/object1.c index dc2fd0d13..2b055cde7 100644 --- a/src/object1.c +++ b/src/object1.c @@ -3527,8 +3527,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) if (command_cmd) prev_tag = cur_tag; command_cmd = 0; /* Hack -- command_cmd is no longer effective */ } - - /* Result */ return (item); } @@ -3583,8 +3581,6 @@ ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode /* Only one */ if (mode & 0x04) break; } - - /* Result */ return num; } @@ -4935,8 +4931,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) if (command_cmd) prev_tag = cur_tag; command_cmd = 0; /* Hack -- command_cmd is no longer effective */ } - - /* Result */ return (item); } diff --git a/src/object2.c b/src/object2.c index 62ff0a85b..6f9106c08 100644 --- a/src/object2.c +++ b/src/object2.c @@ -763,8 +763,6 @@ OBJECT_IDX get_obj_num(DEPTH level) if (table[i].level < table[j].level) i = j; } - - /* Result */ return (table[i].index); } @@ -2134,8 +2132,6 @@ int m_bonus(int max, DEPTH level) /* Enforce the maximum value */ if (value > max) return (max); - - /* Result */ return (value); } @@ -5441,8 +5437,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION msg_print(_("何かが足下に転がってきた。", "You feel something roll beneath your feet.")); } - - /* Result */ return (o_idx); } diff --git a/src/spells2.c b/src/spells2.c index 72f04c6b2..c2ff0ca5a 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -74,8 +74,6 @@ static bool detect_feat_flag(POSITION range, int flag, bool known) } } } - - /* Result */ return detect; } @@ -99,8 +97,6 @@ bool detect_traps(POSITION range, bool known) { msg_print(_("トラップの存在を感じとった！", "You sense the presence of traps!")); } - - /* Result */ return detect; } @@ -121,8 +117,6 @@ bool detect_doors(POSITION range) { msg_print(_("ドアの存在を感じとった！", "You sense the presence of doors!")); } - - /* Result */ return detect; } @@ -143,8 +137,6 @@ bool detect_stairs(POSITION range) { msg_print(_("階段の存在を感じとった！", "You sense the presence of stairs!")); } - - /* Result */ return detect; } @@ -165,8 +157,6 @@ bool detect_treasure(POSITION range) { msg_print(_("埋蔵された財宝の存在を感じとった！", "You sense the presence of buried treasure!")); } - - /* Result */ return detect; } @@ -205,7 +195,6 @@ bool detect_objects_gold(POSITION range) /* Detect "gold" objects */ if (o_ptr->tval == TV_GOLD) { - /* Hack -- memorize it */ o_ptr->marked |= OM_FOUND; lite_spot(y, x); detect = TRUE; @@ -224,8 +213,6 @@ bool detect_objects_gold(POSITION range) { detect = TRUE; } - - /* Result */ return (detect); } @@ -264,7 +251,6 @@ bool detect_objects_normal(POSITION range) /* Detect "real" objects */ if (o_ptr->tval != TV_GOLD) { - /* Hack -- memorize it */ o_ptr->marked |= OM_FOUND; lite_spot(y, x); detect = TRUE; @@ -283,8 +269,6 @@ bool detect_objects_normal(POSITION range) { detect = TRUE; } - - /* Result */ return (detect); } @@ -426,8 +410,6 @@ bool detect_monsters_normal(POSITION range) /* Describe result */ msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!")); } - - /* Result */ return (flag); } @@ -489,8 +471,6 @@ bool detect_monsters_invis(POSITION range) /* Describe result */ msg_print(_("透明な生物の存在を感じとった！", "You sense the presence of invisible creatures!")); } - - /* Result */ return (flag); } @@ -555,8 +535,6 @@ bool detect_monsters_evil(POSITION range) /* Describe result */ msg_print(_("邪悪なる生物の存在を感じとった！", "You sense the presence of evil creatures!")); } - - /* Result */ return (flag); } @@ -615,8 +593,6 @@ bool detect_monsters_nonliving(POSITION range) /* Describe result */ msg_print(_("自然でないモンスターの存在を感じた！", "You sense the presence of unnatural beings!")); } - - /* Result */ return (flag); } @@ -675,8 +651,6 @@ bool detect_monsters_mind(POSITION range) /* Describe result */ msg_print(_("殺気を感じとった！", "You sense the presence of someone's mind!")); } - - /* Result */ return (flag); } @@ -739,8 +713,6 @@ bool detect_monsters_string(POSITION range, cptr Match) /* Describe result */ msg_print(_("モンスターの存在を感じとった！", "You sense the presence of monsters!")); } - - /* Result */ return (flag); } @@ -818,8 +790,6 @@ bool detect_monsters_xxx(POSITION range, u32b match_flag) msg_format(_("%sの存在を感じとった！", "You sense the presence of %s!"), desc_monsters); msg_print(NULL); } - - /* Result */ return (flag); } @@ -845,8 +815,6 @@ bool detect_all(POSITION range) if (detect_objects_normal(range)) detect = TRUE; if (detect_monsters_invis(range)) detect = TRUE; if (detect_monsters_normal(range)) detect = TRUE; - - /* Result */ return (detect); } @@ -907,8 +875,6 @@ bool project_hack(EFFECT_ID typ, HIT_POINT dam) /* Jump directly to the target monster */ if (project(0, 0, y, x, dam, typ, flg, -1)) obvious = TRUE; } - - /* Result */ return (obvious); } @@ -1441,8 +1407,6 @@ bool probing(void) chg_virtue(V_KNOWLEDGE, 1); msg_print(_("これで全部です。", "That's all.")); } - - /* Result */ return (probe); } diff --git a/src/spells3.c b/src/spells3.c index 8e0fae0ed..81fdf77b9 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -4982,8 +4982,6 @@ static IDX poly_r_idx(MONRACE_IDX r_idx) break; } - - /* Result */ return (r_idx); } diff --git a/src/util.c b/src/util.c index 8f8d5f1a6..4276aeffe 100644 --- a/src/util.c +++ b/src/util.c @@ -1580,8 +1580,6 @@ static sint macro_find_ready(cptr pat) n = i; s = t; } - - /* Result */ return (n); } @@ -3619,8 +3617,6 @@ bool get_string(cptr prompt, char *buf, int len) /* Clear prompt */ prt("", 0, 0); - - /* Result */ return (res); } diff --git a/src/xtra2.c b/src/xtra2.c index 54df93987..94eee0b56 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -2740,8 +2740,6 @@ static POSITION_IDX target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION /* Track best */ b_i = i; b_v = v; } - - /* Result */ return (b_i); }