#37287 #37353 (2.2.0.89) 型の置換を継続中。sortのエンバグに対応。 / Ongoing type replacement. Fix new...

[hengband/hengband.git] / src / floors.c

diff --git a/src/floors.c b/src/floors.c
index 11ba5db..20f14df 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -358,7 +358,8 @@ static monster_type party_mon[MAX_PARTY_MON]; /*!< フロア移動に保存す
  */
 static void preserve_pet(void)
 {
-       int num, i;
+       int num;
+       MONSTER_IDX i;
 
        for (num = 0; num < MAX_PARTY_MON; num++)
        {
@@ -523,8 +524,8 @@ static void place_pet(void)
 
        for (i = 0; i < max_num; i++)
        {
-               position cy = 0, cx = 0;
-               idx m_idx;
+               POSITION cy = 0, cx = 0;
+               MONSTER_IDX m_idx;
 
                if (!(party_mon[i].r_idx)) continue;
 
@@ -540,7 +541,8 @@ static void place_pet(void)
                }
                else
                {
-                       int j, d;
+                       int j;
+                       POSITION d;
 
                        for (d = 1; d < 6; d++)
                        {
@@ -690,7 +692,7 @@ static void get_out_monster(void)
        int dis = 1;
        int oy = p_ptr->y;
        int ox = p_ptr->x;
-       int m_idx = cave[oy][ox].m_idx;
+       MONSTER_IDX m_idx = cave[oy][ox].m_idx;
 
        /* Nothing to do if no monster */
        if (!m_idx) return;
@@ -864,7 +866,7 @@ void leave_floor(void)
        feature_type *f_ptr;
        saved_floor_type *sf_ptr;
        int quest_r_idx = 0;
-       int i;
+       DUNGEON_IDX i;
 
        /* Preserve pets and prepare to take these to next floor */
        preserve_pet();
@@ -1207,7 +1209,7 @@ void change_floor(void)
                /* Maintain monsters and artifacts */
                if (loaded)
                {
-                       int i;
+                       IDX i;
                        s32b tmp_last_visit = sf_ptr->last_visit;
                        s32b absence_ticks;
                        int alloc_chance = d_info[dungeon_type].max_m_alloc_chance;