#37784 summon_specific()で特定種族を指定しない(type=0)時はPM_ALLOW_UNIQUEを指定しなくても、ユニークを候補に入れてしまう不具...

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

diff --git a/src/floors.c b/src/floors.c
index fa90359..009dc00 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -30,7 +30,7 @@ void init_saved_floors(bool force)
        char floor_savefile[1024];
        int i;
        int fd = -1;
-       int mode = 0644;
+       BIT_FLAGS mode = 0644;
 
 #ifdef SET_UID
 # ifdef SECURE
@@ -101,7 +101,7 @@ void init_saved_floors(bool force)
        latest_visit_mark = 1;
 
        /* A sign to mark temporal files */
-       saved_floor_file_sign = time(NULL);
+       saved_floor_file_sign = (u32b)time(NULL);
 
        /* No next floor yet */
        new_floor_id = 0;
@@ -238,7 +238,7 @@ static void kill_saved_floor(saved_floor_type *sf_ptr)
 s16b get_new_floor_id(void)
 {
        saved_floor_type *sf_ptr = NULL;
-       int i;
+       s16b i;
 
        /* Look for empty space */
        for (i = 0; i < MAX_SAVED_FLOORS; i++)
@@ -251,7 +251,7 @@ s16b get_new_floor_id(void)
        /* None found */
        if (i == MAX_SAVED_FLOORS)
        {
-               int oldest = 0;
+               s16b oldest = 0;
                u32b oldest_visit = 0xffffffffL;
 
                /* Search for oldest */
@@ -304,7 +304,7 @@ s16b get_new_floor_id(void)
  * @param mode 追加したい所持フラグ
  * @return なし
  */
-void prepare_change_floor_mode(u32b mode)
+void prepare_change_floor_mode(BIT_FLAGS mode)
 {
        change_floor_mode |= mode;
 }
@@ -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++)
        {
@@ -524,7 +525,7 @@ static void place_pet(void)
        for (i = 0; i < max_num; i++)
        {
                POSITION cy = 0, cx = 0;
-               IDX m_idx;
+               MONSTER_IDX m_idx;
 
                if (!(party_mon[i].r_idx)) continue;
 
@@ -691,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;
@@ -865,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();
@@ -1208,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;