OSDN Git Service

[Refactor] #37353 コメント整理 / Refactor comments.
authorDeskull <deskull@users.sourceforge.jp>
Sat, 17 Nov 2018 15:39:22 +0000 (00:39 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Sat, 17 Nov 2018 15:39:22 +0000 (00:39 +0900)
24 files changed:
src/autopick.c
src/bldg.c
src/cave.c
src/cmd-item.c
src/cmd1.c
src/cmd4.c
src/dungeon.c
src/effects.c
src/files.c
src/grid.c
src/init1.c
src/init2.c
src/melee1.c
src/monster-process.c
src/object1.c
src/object2.c
src/rooms-pitnest.c
src/save.c
src/spells2.c
src/spells3.c
src/store.c
src/util.c
src/z-form.c
src/z-virt.c

index 6d5b823..52ced4d 100644 (file)
@@ -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;
        }
 
index 4049667..34a0ac7 100644 (file)
@@ -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);
 }
 
index 16a01b3..89a1d81 100644 (file)
@@ -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;
                }
        }
index f636532..eb8b4ed 100644 (file)
@@ -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;
        }
 
index fbe1dd1..f4694fc 100644 (file)
@@ -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;
                }
        }
index 83a6c8f..1506b5f 100644 (file)
@@ -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)
                {
index a6fea44..2551927 100644 (file)
@@ -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;
                }
        }
index 1b28221..262dd79 100644 (file)
@@ -3836,7 +3836,6 @@ bool dec_stat(int stat, int amount, int permanent)
                p_ptr->update |= (PU_BONUS);
        }
 
-       /* Done */
        return (res);
 }
 
index 10ee2e7..bc6854e 100644 (file)
@@ -1472,7 +1472,6 @@ errr check_load_init(void)
                /* Use that value */
                check_load_value = value;
 
-               /* Done */
                break;
        }
 
index 57a79c8..c0b0e71 100644 (file)
@@ -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;
        }
 }
index 793193d..acd5915 100644 (file)
@@ -5111,7 +5111,6 @@ void write_r_info_txt(void)
                fprintf(fff, "\n");
        }
 
-       /* Done */
        fclose(fff);
 }
 
index 5787661..827a58c 100644 (file)
@@ -2475,7 +2475,6 @@ void init_angband(void)
        /* Process that file */
        process_pref_file(buf);
 
-       /* Done */
        note(_("[初期化終了]", "[Initialization complete]"));
 }
 
index 1b37c5c..23ca9ac 100644 (file)
@@ -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;
                                        }
 
index 4d15c89..0a43f37 100644 (file)
@@ -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;
                }
        }
index 6c5e085..0a11334 100644 (file)
@@ -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;
                        }
                }
index c78c359..8daf248 100644 (file)
@@ -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;
                                }
                        }
index 7574f82..efb7c68 100644 (file)
@@ -479,7 +479,6 @@ static void vault_prep_dragon(void)
                /* Restrict dragon breath type */\r
                vault_aux_dragon_mask4 = RF4_BR_ACID;\r
 \r
-               /* Done */\r
                break;\r
        }\r
 \r
@@ -489,7 +488,6 @@ static void vault_prep_dragon(void)
                /* Restrict dragon breath type */\r
                vault_aux_dragon_mask4 = RF4_BR_ELEC;\r
 \r
-               /* Done */\r
                break;\r
        }\r
 \r
@@ -499,7 +497,6 @@ static void vault_prep_dragon(void)
                /* Restrict dragon breath type */\r
                vault_aux_dragon_mask4 = RF4_BR_FIRE;\r
 \r
-               /* Done */\r
                break;\r
        }\r
 \r
@@ -509,7 +506,6 @@ static void vault_prep_dragon(void)
                /* Restrict dragon breath type */\r
                vault_aux_dragon_mask4 = RF4_BR_COLD;\r
 \r
-               /* Done */\r
                break;\r
        }\r
 \r
@@ -519,7 +515,6 @@ static void vault_prep_dragon(void)
                /* Restrict dragon breath type */\r
                vault_aux_dragon_mask4 = RF4_BR_POIS;\r
 \r
-               /* Done */\r
                break;\r
        }\r
 \r
@@ -531,7 +526,6 @@ static void vault_prep_dragon(void)
                        RF4_BR_FIRE | RF4_BR_COLD |\r
                        RF4_BR_POIS);\r
 \r
-               /* Done */\r
                break;\r
        }\r
        }\r
index a379938..7db8b36 100644 (file)
@@ -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);
                }
 
index fbc047d..94194fa 100644 (file)
@@ -1510,7 +1510,6 @@ bool probing(void)
        Term->scr->cv = cv;
        Term_fresh();
 
-       /* Done */
        if (probe)
        {
                chg_virtue(V_KNOWLEDGE, 1);
index cc014ec..d73d147 100644 (file)
@@ -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;
        }
 
index b303cf9..084d2ae 100644 (file)
@@ -1646,7 +1646,6 @@ bool combine_and_reorder_home(int store_num)
                                        /* Take note */
                                        combined = TRUE;
 
-                                       /* Done */
                                        break;
                                }
                        }
index bbfcbdb..9a321f5 100644 (file)
@@ -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;
        }
 
index 69d4995..a668f84 100644 (file)
@@ -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;
                                }
                        }
index 9613fac..400d25a 100644 (file)
@@ -57,7 +57,6 @@ vptr rnfree(vptr p, huge len)
        /* Use "free" */
        free ((char*)(p));
 
-       /* Done */
        return (NULL);
 }