[Refactor] #37353 コメント整理。 / Refactor comments, (Duplicated meaning "Prepare allocatio...

diff --git a/src/birth.c b/src/birth.c
index 41609c2..d476135 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -1839,7 +1839,7 @@ void determine_random_questor(quest_type *q_ptr)
        MONRACE_IDX r_idx;
        monster_race *r_ptr;
 
        MONRACE_IDX r_idx;
        monster_race *r_ptr;
 

-       /* Prepare allocation table */
+       

        get_mon_num_prep(mon_hook_quest, NULL);
 
        while (1)
        get_mon_num_prep(mon_hook_quest, NULL);
 
        while (1)


@@ -2252,8 +2252,6 @@ void player_outfit(void)
 
        case RACE_DEMON:
                /* Demon can drain vitality from humanoid corpse */
 
        case RACE_DEMON:
                /* Demon can drain vitality from humanoid corpse */

-
-               /* Prepare allocation table */

                get_mon_num_prep(monster_hook_human, NULL);
 
                for (i = rand_range(3,4); i > 0; i--)
                get_mon_num_prep(monster_hook_human, NULL);
 
                for (i = rand_range(3,4); i > 0; i--)

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 7c14f83..10c06e8 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -597,8 +597,6 @@ static bool cave_gen(void)
 
        /* Fill the arrays of floors and walls in the good proportions */
        set_floor_and_wall(dungeon_type);
 
        /* Fill the arrays of floors and walls in the good proportions */
        set_floor_and_wall(dungeon_type);

-
-       /* Prepare allocation table */

        get_mon_num_prep(get_monster_hook(), NULL);
 
        /* Randomize the dungeon creation values */
        get_mon_num_prep(get_monster_hook(), NULL);
 
        /* Randomize the dungeon creation values */


@@ -1231,8 +1229,6 @@ static void quest_gen(void)
        monster_level = base_level;
 
        if (record_stair) do_cmd_write_nikki(NIKKI_TO_QUEST, p_ptr->inside_quest, NULL);
        monster_level = base_level;
 
        if (record_stair) do_cmd_write_nikki(NIKKI_TO_QUEST, p_ptr->inside_quest, NULL);

-
-       /* Prepare allocation table */

        get_mon_num_prep(get_monster_hook(), NULL);
 
        init_flags = INIT_CREATE_DUNGEON;
        get_mon_num_prep(get_monster_hook(), NULL);
 
        init_flags = INIT_CREATE_DUNGEON;

diff --git a/src/monster2.c b/src/monster2.c
index 7b6acb0..cb29740 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -3622,8 +3622,6 @@ bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_id
 
                        /* Require empty grids */
                        if (!cave_empty_bold2(ny, nx)) continue;
 
                        /* Require empty grids */
                        if (!cave_empty_bold2(ny, nx)) continue;

-
-                       /* Prepare allocation table */

                        get_mon_num_prep(place_monster_can_escort, get_monster_hook2(ny, nx));
 
                        /* Pick a random race */
                        get_mon_num_prep(place_monster_can_escort, get_monster_hook2(ny, nx));
 
                        /* Pick a random race */


@@ -3659,8 +3657,6 @@ bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_id
 bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode)
 {
        MONRACE_IDX r_idx;
 bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode)
 {
        MONRACE_IDX r_idx;

-
-       /* Prepare allocation table */

        get_mon_num_prep(get_monster_hook(), get_monster_hook2(y, x));
 
        /* Pick a monster */
        get_mon_num_prep(get_monster_hook(), get_monster_hook2(y, x));
 
        /* Pick a monster */


@@ -3689,8 +3685,6 @@ bool alloc_horde(POSITION y, POSITION x)
        int attempts = 1000;
        POSITION cy = y;
        POSITION cx = x;
        int attempts = 1000;
        POSITION cy = y;
        POSITION cx = x;

-
-       /* Prepare allocation table */

        get_mon_num_prep(get_monster_hook(), get_monster_hook2(y, x));
 
        while (--attempts)
        get_mon_num_prep(get_monster_hook(), get_monster_hook2(y, x));
 
        while (--attempts)


@@ -3942,8 +3936,6 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t
        summon_kin_type = symbol;
 
        summon_unique_okay = (mode & PM_ALLOW_UNIQUE) ? TRUE : FALSE;
        summon_kin_type = symbol;
 
        summon_unique_okay = (mode & PM_ALLOW_UNIQUE) ? TRUE : FALSE;

-
-       /* Prepare allocation table */

        get_mon_num_prep(summon_specific_okay, get_monster_hook2(y, x));
 
        /* Pick a monster, using the level calculation */
        get_mon_num_prep(summon_specific_okay, get_monster_hook2(y, x));
 
        /* Pick a monster, using the level calculation */

diff --git a/src/rooms-pitnest.c b/src/rooms-pitnest.c
index f1ff05d..cca13f8 100644 (file)
--- a/src/rooms-pitnest.c
+++ b/src/rooms-pitnest.c
@@ -295,8 +295,6 @@ bool build_type5(void)
 \r
        /* Process a preparation function if necessary */\r
        if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r
 \r
        /* Process a preparation function if necessary */\r
        if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r

-\r
-       /* Prepare allocation table */\r

        get_mon_num_prep(n_ptr->hook_func, NULL);\r
 \r
        align.sub_align = SUB_ALIGN_NEUTRAL;\r
        get_mon_num_prep(n_ptr->hook_func, NULL);\r
 \r
        align.sub_align = SUB_ALIGN_NEUTRAL;\r


@@ -508,8 +506,6 @@ bool build_type6(void)
 \r
        /* Process a preparation function if necessary */\r
        if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r
 \r
        /* Process a preparation function if necessary */\r
        if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r

-\r
-       /* Prepare allocation table */\r

        get_mon_num_prep(n_ptr->hook_func, NULL);\r
 \r
        align.sub_align = SUB_ALIGN_NEUTRAL;\r
        get_mon_num_prep(n_ptr->hook_func, NULL);\r
 \r
        align.sub_align = SUB_ALIGN_NEUTRAL;\r


@@ -818,8 +814,6 @@ bool build_type13(void)
 \r
        /* Process a preparation function if necessary */\r
        if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r
 \r
        /* Process a preparation function if necessary */\r
        if (n_ptr->prep_func) (*(n_ptr->prep_func))();\r

-\r
-       /* Prepare allocation table */\r

        get_mon_num_prep(n_ptr->hook_func, vault_aux_trapped_pit);\r
 \r
        align.sub_align = SUB_ALIGN_NEUTRAL;\r
        get_mon_num_prep(n_ptr->hook_func, vault_aux_trapped_pit);\r
 \r
        align.sub_align = SUB_ALIGN_NEUTRAL;\r

diff --git a/src/rooms-special.c b/src/rooms-special.c
index 8cfb12f..8667231 100644 (file)
--- a/src/rooms-special.c
+++ b/src/rooms-special.c
@@ -72,8 +72,6 @@ bool build_type15(void)
        case 1: /* 4 lite breathers + potion */\r
        {\r
                int dir1, dir2;\r
        case 1: /* 4 lite breathers + potion */\r
        {\r
                int dir1, dir2;\r

-\r
-               /* Prepare allocation table */\r

                get_mon_num_prep(vault_aux_lite, NULL);\r
 \r
                /* Place fixed lite berathers */\r
                get_mon_num_prep(vault_aux_lite, NULL);\r
 \r
                /* Place fixed lite berathers */\r


@@ -141,8 +139,6 @@ bool build_type15(void)
                c_ptr = &cave[y2 - 1][x2 - 1];\r
                place_inner_grid(c_ptr);\r
                c_ptr->feat = feat_glass_wall;\r
                c_ptr = &cave[y2 - 1][x2 - 1];\r
                place_inner_grid(c_ptr);\r
                c_ptr->feat = feat_glass_wall;\r

-\r
-               /* Prepare allocation table */\r

                get_mon_num_prep(vault_aux_lite, NULL);\r
 \r
                r_idx = get_mon_num(dun_level);\r
                get_mon_num_prep(vault_aux_lite, NULL);\r
 \r
                r_idx = get_mon_num(dun_level);\r


@@ -203,8 +199,6 @@ bool build_type15(void)
                        place_inner_grid(c_ptr);\r
                        c_ptr->feat = feat_glass_wall;\r
                }\r
                        place_inner_grid(c_ptr);\r
                        c_ptr->feat = feat_glass_wall;\r
                }\r

-\r
-               /* Prepare allocation table */\r

                get_mon_num_prep(vault_aux_shards, NULL);\r
 \r
                /* Place shard berathers */\r
                get_mon_num_prep(vault_aux_shards, NULL);\r
 \r
                /* Place shard berathers */\r

diff --git a/src/wild.c b/src/wild.c
index 90f82c9..cc83444 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -464,8 +464,6 @@ void wilderness_gen(void)
 
        x = p_ptr->wilderness_x;
        y = p_ptr->wilderness_y;
 
        x = p_ptr->wilderness_x;
        y = p_ptr->wilderness_y;

-
-       /* Prepare allocation table */

        get_mon_num_prep(get_monster_hook(), NULL);
 
        /* North border */
        get_mon_num_prep(get_monster_hook(), NULL);
 
        /* North border */