From: Deskull Date: Sat, 17 Nov 2018 15:39:22 +0000 (+0900) Subject: [Refactor] #37353 コメント整理 / Refactor comments. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bc0b36b162786b37212bb99575020e94ed9380ee;p=hengband%2Fhengband.git [Refactor] #37353 コメント整理 / Refactor comments. --- diff --git a/src/autopick.c b/src/autopick.c index 6d5b823f2..52ced4d58 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -1589,7 +1589,6 @@ static void auto_destroy_item(object_type *o_ptr, int autopick_idx) msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name); - /* Done */ return; } @@ -1936,7 +1935,6 @@ bool autopick_autoregister(object_type *o_ptr) msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name); - /* Done */ return FALSE; } diff --git a/src/bldg.c b/src/bldg.c index 4049667cf..34a0ac7c7 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -2947,7 +2947,6 @@ static PRICE compare_weapons(PRICE bcost) /* Restore the screen */ screen_load(); - /* Done */ return (total); } @@ -3046,7 +3045,6 @@ static bool eval_ac(ARMOUR_CLASS iAC) (void)inkey(); screen_load(); - /* Done */ return (TRUE); } diff --git a/src/cave.c b/src/cave.c index 16a01b322..89a1d8117 100644 --- a/src/cave.c +++ b/src/cave.c @@ -1236,7 +1236,6 @@ void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap, /* Hack -- hallucination */ if (p_ptr->image) image_object(ap, cp); - /* Done */ break; } } diff --git a/src/cmd-item.c b/src/cmd-item.c index f63653239..eb8b4ed52 100644 --- a/src/cmd-item.c +++ b/src/cmd-item.c @@ -903,7 +903,6 @@ void do_cmd_destroy(void) p_ptr->energy_use = 0; msg_format(_("%sは破壊不可能だ。", "You cannot destroy %s."), o_name); - /* Done */ return; } diff --git a/src/cmd1.c b/src/cmd1.c index fbe1dd165..f4694fcfb 100644 --- a/src/cmd1.c +++ b/src/cmd1.c @@ -2146,7 +2146,6 @@ void run_step(DIRECTION dir) /* Disturb */ disturb(0, 0); - /* Done */ return; } @@ -2163,7 +2162,6 @@ void run_step(DIRECTION dir) /* Disturb */ disturb(0, 0); - /* Done */ return; } } diff --git a/src/cmd4.c b/src/cmd4.c index 83a6c8f4c..1506b5f2c 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -918,7 +918,6 @@ void do_cmd_nikki(void) /* Prompt */ i = inkey(); - /* Done */ if (i == ESCAPE) break; switch (i) @@ -1309,7 +1308,6 @@ void do_cmd_messages(int num_now) /* New location */ i = z; - /* Done */ break; } } @@ -3112,7 +3110,6 @@ void do_cmd_visuals(void) /* Prompt */ i = inkey(); - /* Done */ if (i == ESCAPE) break; switch (i) @@ -3699,7 +3696,6 @@ void do_cmd_colors(void) /* Prompt */ i = inkey(); - /* Done */ if (i == ESCAPE) break; /* Load a 'pref' file */ @@ -8579,7 +8575,6 @@ void do_cmd_knowledge(void) /* Prompt */ i = inkey(); - /* Done */ if (i == ESCAPE) break; switch (i) { diff --git a/src/dungeon.c b/src/dungeon.c index a6fea44f3..255192770 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -193,7 +193,6 @@ static void sense_inventory1(void) /* Heavy sensing */ heavy = TRUE; - /* Done */ break; } @@ -205,7 +204,6 @@ static void sense_inventory1(void) /* Heavy sensing */ heavy = TRUE; - /* Done */ break; } @@ -217,7 +215,6 @@ static void sense_inventory1(void) /* Very bad (light) sensing */ if (0 != randint0(240000L / (plev + 5))) return; - /* Done */ break; } @@ -227,7 +224,6 @@ static void sense_inventory1(void) /* Good (light) sensing */ if (0 != randint0(10000L / (plev * plev + 40))) return; - /* Done */ break; } @@ -240,7 +236,6 @@ static void sense_inventory1(void) /* Heavy sensing */ heavy = TRUE; - /* Done */ break; } @@ -252,7 +247,6 @@ static void sense_inventory1(void) /* Changed! */ heavy = TRUE; - /* Done */ break; } @@ -265,7 +259,6 @@ static void sense_inventory1(void) /* Heavy sensing */ heavy = TRUE; - /* Done */ break; } @@ -275,7 +268,6 @@ static void sense_inventory1(void) /* Bad sensing */ if (0 != randint0(75000L / (plev * plev + 40))) return; - /* Done */ break; } @@ -287,7 +279,6 @@ static void sense_inventory1(void) /* Bad sensing */ if (0 != randint0(55000L / (plev * plev + 40))) return; - /* Done */ break; } @@ -299,7 +290,6 @@ static void sense_inventory1(void) /* Changed! */ heavy = TRUE; - /* Done */ break; } @@ -309,7 +299,6 @@ static void sense_inventory1(void) /* Okay sensing */ if (0 != randint0(20000L / (plev * plev + 40))) return; - /* Done */ break; } @@ -321,7 +310,6 @@ static void sense_inventory1(void) /* Heavy sensing */ heavy = TRUE; - /* Done */ break; } @@ -330,7 +318,6 @@ static void sense_inventory1(void) /* Bad sensing */ if (0 != randint0(65000L / (plev * plev + 40))) return; - /* Done */ break; } case CLASS_BERSERKER: @@ -338,7 +325,6 @@ static void sense_inventory1(void) /* Heavy sensing */ heavy = TRUE; - /* Done */ break; } } @@ -439,7 +425,6 @@ static void sense_inventory2(void) /* Very bad (light) sensing */ if (0 != randint0(240000L / (plev + 5))) return; - /* Done */ break; } @@ -451,7 +436,6 @@ static void sense_inventory2(void) /* Bad sensing */ if (0 != randint0(95000L / (plev * plev + 40))) return; - /* Done */ break; } @@ -464,7 +448,6 @@ static void sense_inventory2(void) /* Good sensing */ if (0 != randint0(20000L / (plev * plev + 40))) return; - /* Done */ break; } @@ -478,7 +461,6 @@ static void sense_inventory2(void) /* Good sensing */ if (0 != randint0(9000L / (plev * plev + 40))) return; - /* Done */ break; } @@ -487,7 +469,6 @@ static void sense_inventory2(void) /* Good sensing */ if (0 != randint0(20000L / ((plev+50)*(plev+50)))) return; - /* Done */ break; } } diff --git a/src/effects.c b/src/effects.c index 1b2822192..262dd796c 100644 --- a/src/effects.c +++ b/src/effects.c @@ -3836,7 +3836,6 @@ bool dec_stat(int stat, int amount, int permanent) p_ptr->update |= (PU_BONUS); } - /* Done */ return (res); } diff --git a/src/files.c b/src/files.c index 10ee2e728..bc6854e46 100644 --- a/src/files.c +++ b/src/files.c @@ -1472,7 +1472,6 @@ errr check_load_init(void) /* Use that value */ check_load_value = value; - /* Done */ break; } diff --git a/src/grid.c b/src/grid.c index 57a79c857..c0b0e713f 100644 --- a/src/grid.c +++ b/src/grid.c @@ -64,7 +64,6 @@ bool new_player_spot(void) /* Refuse to start on anti-teleport grids */ if (c_ptr->info & (CAVE_ICKY)) continue; - /* Done */ break; } @@ -654,7 +653,6 @@ void vault_trap_aux(POSITION y, POSITION x, POSITION yd, POSITION xd) /* Place the trap */ place_trap(y1, x1); - /* Done */ break; } } diff --git a/src/init1.c b/src/init1.c index 793193d04..acd591530 100644 --- a/src/init1.c +++ b/src/init1.c @@ -5111,7 +5111,6 @@ void write_r_info_txt(void) fprintf(fff, "\n"); } - /* Done */ fclose(fff); } diff --git a/src/init2.c b/src/init2.c index 5787661af..827a58caa 100644 --- a/src/init2.c +++ b/src/init2.c @@ -2475,7 +2475,6 @@ void init_angband(void) /* Process that file */ process_pref_file(buf); - /* Done */ note(_("[初期化終了]", "[Initialization complete]")); } diff --git a/src/melee1.c b/src/melee1.c index 1b37c5c13..23ca9ace0 100644 --- a/src/melee1.c +++ b/src/melee1.c @@ -1423,7 +1423,6 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode) /* Disturb the monster */ (void)set_monster_csleep(c_ptr->m_idx, 0); - /* Done */ return FALSE; } @@ -2101,7 +2100,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Window stuff */ p_ptr->window |= (PW_INVEN); - /* Done */ break; } } @@ -2196,7 +2194,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Obvious */ obvious = TRUE; - /* Done */ break; } @@ -2283,7 +2280,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Blink away */ blinked = TRUE; - /* Done */ break; } @@ -2333,7 +2329,6 @@ bool make_attack_normal(MONSTER_IDX m_idx) /* Obvious */ obvious = TRUE; - /* Done */ break; } diff --git a/src/monster-process.c b/src/monster-process.c index 4d15c8990..0a43f3706 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -1181,7 +1181,6 @@ static bool get_moves(MONSTER_IDX m_idx, int *mm) y = m_ptr->fy - y2; x = m_ptr->fx - x2; - /* Done */ done = TRUE; } } diff --git a/src/object1.c b/src/object1.c index 6c5e085ab..0a1133421 100644 --- a/src/object1.c +++ b/src/object1.c @@ -2934,7 +2934,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Oops */ oops = TRUE; - /* Done */ done = TRUE; if (select_the_force) { @@ -3984,7 +3983,6 @@ bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode) /* Oops */ oops = TRUE; - /* Done */ done = TRUE; if (select_the_force) { @@ -5136,7 +5134,6 @@ void py_pickup_floor(bool pickup) msg_format(_("%d 個のアイテムの山がある。", "You see a pile of %d items."), floor_num); } - /* Done */ return; } @@ -5173,7 +5170,6 @@ void py_pickup_floor(bool pickup) } - /* Done */ return; } @@ -5208,7 +5204,6 @@ void py_pickup_floor(bool pickup) /* Ask the user to confirm */ if (!get_check(out_val)) { - /* Done */ return; } } diff --git a/src/object2.c b/src/object2.c index c78c3593d..8daf248f8 100644 --- a/src/object2.c +++ b/src/object2.c @@ -89,7 +89,6 @@ void excise_object_idx(OBJECT_IDX o_idx) /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; - /* Done */ if (this_o_idx == o_idx) { /* No previous */ @@ -114,7 +113,6 @@ void excise_object_idx(OBJECT_IDX o_idx) /* Forget next pointer */ o_ptr->next_o_idx = 0; - /* Done */ break; } @@ -145,7 +143,6 @@ void excise_object_idx(OBJECT_IDX o_idx) /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; - /* Done */ if (this_o_idx == o_idx) { /* No previous */ @@ -170,7 +167,6 @@ void excise_object_idx(OBJECT_IDX o_idx) /* Forget next pointer */ o_ptr->next_o_idx = 0; - /* Done */ break; } @@ -1347,7 +1343,6 @@ PRICE object_value_real(object_type *o_ptr) */ value += (value * o_ptr->pval / o_ptr->number / (k_ptr->pval * 2)); - /* Done */ break; } case TV_STAFF: @@ -1357,7 +1352,6 @@ PRICE object_value_real(object_type *o_ptr) */ value += (value * o_ptr->pval / (k_ptr->pval * 2)); - /* Done */ break; } @@ -1371,7 +1365,6 @@ PRICE object_value_real(object_type *o_ptr) /* Give credit for bonuses */ value += ((o_ptr->to_h + o_ptr->to_d + o_ptr->to_a) * 200L); - /* Done */ break; } @@ -1392,7 +1385,6 @@ PRICE object_value_real(object_type *o_ptr) /* Give credit for bonuses */ value += (((o_ptr->to_h - k_ptr->to_h) + (o_ptr->to_d - k_ptr->to_d)) * 200L + (o_ptr->to_a) * 100L); - /* Done */ break; } @@ -1413,7 +1405,6 @@ PRICE object_value_real(object_type *o_ptr) value += (o_ptr->dd - k_ptr->dd) * o_ptr->ds * 250L; value += (o_ptr->ds - k_ptr->ds) * o_ptr->dd * 250L; - /* Done */ break; } @@ -1432,7 +1423,6 @@ PRICE object_value_real(object_type *o_ptr) value += (o_ptr->dd - k_ptr->dd) * o_ptr->ds * 5L; value += (o_ptr->ds - k_ptr->ds) * o_ptr->dd * 5L; - /* Done */ break; } @@ -1556,7 +1546,6 @@ bool can_player_destroy_object(object_type *o_ptr) /* Window stuff */ p_ptr->window |= (PW_INVEN | PW_EQUIP); - /* Done */ return FALSE; } @@ -4481,7 +4470,6 @@ void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode) if (a_ptr->gen_flags & (TRG_RANDOM_CURSE1)) o_ptr->curse_flags |= get_curse(1, o_ptr); if (a_ptr->gen_flags & (TRG_RANDOM_CURSE2)) o_ptr->curse_flags |= get_curse(2, o_ptr); - /* Done */ return; } @@ -4718,7 +4706,6 @@ void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode) o_ptr->pval = 2; } - /* Done */ return; } @@ -5394,7 +5381,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION /* Success */ done = TRUE; - /* Done */ break; } } @@ -6480,7 +6466,6 @@ void combine_pack(void) /* Take note */ combined = TRUE; - /* Done */ break; } } diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c index 7574f8207..efb7c68ac 100644 --- a/src/rooms-pitnest.c +++ b/src/rooms-pitnest.c @@ -479,7 +479,6 @@ static void vault_prep_dragon(void) /* Restrict dragon breath type */ vault_aux_dragon_mask4 = RF4_BR_ACID; - /* Done */ break; } @@ -489,7 +488,6 @@ static void vault_prep_dragon(void) /* Restrict dragon breath type */ vault_aux_dragon_mask4 = RF4_BR_ELEC; - /* Done */ break; } @@ -499,7 +497,6 @@ static void vault_prep_dragon(void) /* Restrict dragon breath type */ vault_aux_dragon_mask4 = RF4_BR_FIRE; - /* Done */ break; } @@ -509,7 +506,6 @@ static void vault_prep_dragon(void) /* Restrict dragon breath type */ vault_aux_dragon_mask4 = RF4_BR_COLD; - /* Done */ break; } @@ -519,7 +515,6 @@ static void vault_prep_dragon(void) /* Restrict dragon breath type */ vault_aux_dragon_mask4 = RF4_BR_POIS; - /* Done */ break; } @@ -531,7 +526,6 @@ static void vault_prep_dragon(void) RF4_BR_FIRE | RF4_BR_COLD | RF4_BR_POIS); - /* Done */ break; } } diff --git a/src/save.c b/src/save.c index a3799385f..7db8b36d8 100644 --- a/src/save.c +++ b/src/save.c @@ -1979,7 +1979,6 @@ bool load_player(void) /* A character was loaded */ character_loaded = TRUE; - /* Done */ return (TRUE); } @@ -1989,7 +1988,6 @@ bool load_player(void) /* Count lives */ sf_lives++; - /* Done */ return (TRUE); } diff --git a/src/spells2.c b/src/spells2.c index fbc047dcc..94194fa01 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -1510,7 +1510,6 @@ bool probing(void) Term->scr->cv = cv; Term_fresh(); - /* Done */ if (probe) { chg_virtue(V_KNOWLEDGE, 1); diff --git a/src/spells3.c b/src/spells3.c index cc014ecb8..d73d147b8 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -2010,7 +2010,6 @@ bool alchemy(void) { msg_format(_("%sを金に変えることに失敗した。", "You fail to turn %s to gold!"), o_name); - /* Done */ return FALSE; } @@ -5020,7 +5019,6 @@ static IDX poly_r_idx(MONRACE_IDX r_idx) /* Use that index */ r_idx = r; - /* Done */ break; } diff --git a/src/store.c b/src/store.c index b303cf953..084d2aeaa 100644 --- a/src/store.c +++ b/src/store.c @@ -1646,7 +1646,6 @@ bool combine_and_reorder_home(int store_num) /* Take note */ combined = TRUE; - /* Done */ break; } } diff --git a/src/util.c b/src/util.c index bbfcbdb08..9a321f55f 100644 --- a/src/util.c +++ b/src/util.c @@ -2206,7 +2206,6 @@ char inkey(void) /* Wait for (and remove) a pending key */ if (0 == Term_inkey(&ch, TRUE, TRUE)) { - /* Done */ break; } @@ -2220,7 +2219,6 @@ char inkey(void) /* Check for (and remove) a pending key */ if (0 == Term_inkey(&ch, FALSE, TRUE)) { - /* Done */ break; } @@ -2238,7 +2236,6 @@ char inkey(void) } } - /* Done */ break; } @@ -2594,7 +2591,6 @@ void message_add(cptr str) now_message++; } - /* Done */ break; } @@ -4617,7 +4613,6 @@ void request_command(int shopping) /* Use command */ command_cmd = (byte)cmd; - /* Done */ break; } diff --git a/src/z-form.c b/src/z-form.c index 69d499535..a668f8479 100644 --- a/src/z-form.c +++ b/src/z-form.c @@ -468,7 +468,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) /* Format the argument */ sprintf(tmp, "%c", arg); - /* Done */ break; } @@ -496,7 +495,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) sprintf(tmp, aux, arg); } - /* Done */ break; } @@ -522,7 +520,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) } - /* Done */ break; } @@ -539,7 +536,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) /* Format the argument */ sprintf(tmp, aux, arg); - /* Done */ break; } @@ -554,7 +550,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) /* Format the argument */ sprintf(tmp, aux, arg); - /* Done */ break; } @@ -577,7 +572,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) /* Format the argument */ sprintf(tmp, aux, arg); - /* Done */ break; } @@ -593,7 +587,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) /* Format the "user data" */ sprintf(tmp, aux, arg); - /* Done */ break; } @@ -626,7 +619,6 @@ uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp) if (islower(tmp[q])) tmp[q] = (char)toupper(tmp[q]); - /* Done */ break; } } diff --git a/src/z-virt.c b/src/z-virt.c index 9613fac50..400d25adf 100644 --- a/src/z-virt.c +++ b/src/z-virt.c @@ -57,7 +57,6 @@ vptr rnfree(vptr p, huge len) /* Use "free" */ free ((char*)(p)); - /* Done */ return (NULL); }