[Refactor] #37353 cmd4.c を cmd-dump.c に改名して関数整理．

[hengband/hengband.git] / src / floor-generate.c

diff --git a/src/floor-generate.c b/src/floor-generate.c
index 5bf7591..acf2c26 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -98,9 +98,12 @@
 
 #include "angband.h"
 #include "util.h"
+#include "bldg.h"
 
+#include "cmd-dump.h"
 #include "grid.h"
 #include "rooms.h"
+#include "dungeon.h"
 #include "floor.h"
 #include "floor-save.h"
 #include "floor-streams.h"
@@ -117,6 +120,7 @@
 #include "dungeon-file.h"
 #include "init.h"
 #include "feature.h"
+#include "spells.h"
 
 int dun_tun_rnd; 
 int dun_tun_chg;
@@ -1180,7 +1184,7 @@ static void generate_gambling_arena(void)
                place_monster_aux(0, p_ptr->y + 8 + (i/2)*4, p_ptr->x - 2 + (i%2)*4, battle_mon[i], (PM_NO_KAGE | PM_NO_PET));
                set_friendly(&current_floor_ptr->m_list[current_floor_ptr->grid_array[p_ptr->y+8+(i/2)*4][p_ptr->x-2+(i%2)*4].m_idx]);
        }
-       for(i = 1; i < m_max; i++)
+       for(i = 1; i < current_floor_ptr->m_max; i++)
        {
                monster_type *m_ptr = &current_floor_ptr->m_list[i];
 
@@ -1327,16 +1331,16 @@ void clear_cave(void)
        int i;
 
        /* Very simplified version of wipe_o_list() */
-       (void)C_WIPE(current_floor_ptr->o_list, o_max, object_type);
-       o_max = 1;
-       o_cnt = 0;
+       (void)C_WIPE(current_floor_ptr->o_list, current_floor_ptr->o_max, object_type);
+       current_floor_ptr->o_max = 1;
+       current_floor_ptr->o_cnt = 0;
 
        /* Very simplified version of wipe_m_list() */
        for (i = 1; i < max_r_idx; i++)
                r_info[i].cur_num = 0;
-       (void)C_WIPE(current_floor_ptr->m_list, m_max, monster_type);
-       m_max = 1;
-       m_cnt = 0;
+       (void)C_WIPE(current_floor_ptr->m_list, current_floor_ptr->m_max, monster_type);
+       current_floor_ptr->m_max = 1;
+       current_floor_ptr->m_cnt = 0;
        for (i = 0; i < MAX_MTIMED; i++) current_floor_ptr->mproc_max[i] = 0;
 
        /* Pre-calc cur_num of pets in party_mon[] */
@@ -1432,13 +1436,13 @@ void generate_random_floor(void)
 
 
                /* Prevent object over-flow */
-               if (o_max >= current_floor_ptr->max_o_idx)
+               if (current_floor_ptr->o_max >= current_floor_ptr->max_o_idx)
                {
                        why = _("アイテムが多すぎる", "too many objects");
                        okay = FALSE;
                }
                /* Prevent monster over-flow */
-               else if (m_max >= current_floor_ptr->max_m_idx)
+               else if (current_floor_ptr->m_max >= current_floor_ptr->max_m_idx)
                {
                        why = _("モンスターが多すぎる", "too many monsters");
                        okay = FALSE;