#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

diff --git a/src/externs.h b/src/externs.h
index ab72034..8279db5 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -973,7 +973,7 @@ extern void delete_monster_idx(MONSTER_IDX i);
 extern void delete_monster(POSITION y, POSITION x);
 extern void compact_monsters(int size);
 extern void wipe_m_list(void);
-extern s16b m_pop(void);
+extern MONSTER_IDX m_pop(void);
 extern errr get_mon_num_prep(monster_hook_type monster_hook, monster_hook_type monster_hook2);
 extern MONRACE_IDX get_mon_num(DEPTH level);
 extern void monster_desc(char *desc, monster_type *m_ptr, int mode);

diff --git a/src/load.c b/src/load.c
index 6a79fe9..106ee4a 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -3305,7 +3305,6 @@ static errr rd_dungeon(void)
                for (i = 0; i < num; i++)
                {
                        saved_floor_type *sf_ptr = &saved_floors[i];
-                       byte tmp8u;
 
                        /* Unused element */
                        if (!sf_ptr->floor_id) continue;
@@ -3611,7 +3610,7 @@ static errr rd_savefile_new_aux(void)
                                                else
                                                {
                                                        init_flags = INIT_ASSIGN;
-                                                       p_ptr->inside_quest = i;
+                                                       p_ptr->inside_quest = (QUEST_IDX)i;
 
                                                        process_dungeon_file("q_info.txt", 0, 0, 0, 0);
                                                        p_ptr->inside_quest = old_inside_quest;

diff --git a/src/melee2.c b/src/melee2.c
index 6f5b9de..0b0fb31 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -3649,7 +3649,8 @@ static void mproc_remove(MONSTER_IDX m_idx, int mproc_type)
 void mproc_init(void)
 {
        monster_type *m_ptr;
-       int          i, cmi;
+       MONSTER_IDX i;
+       int cmi;
 
        /* Reset "mproc_max[]" */
        for (cmi = 0; cmi < MAX_MTIMED; cmi++) mproc_max[cmi] = 0;

diff --git a/src/monster2.c b/src/monster2.c
index 5b21c5c..63eaa8f 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -593,9 +593,9 @@ void wipe_m_list(void)
  * @details
  * This routine should almost never fail, but it *can* happen.
  */
-s16b m_pop(void)
+MONSTER_IDX m_pop(void)
 {
-       int i;
+       MONSTER_IDX i;
 
 
        /* Normal allocation */
@@ -3039,7 +3039,7 @@ byte get_mspeed(monster_race *r_ptr)
  * This is the only function which may place a monster in the dungeon,
  * except for the savefile loading code.
  */
-static bool place_monster_one(IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode)
+static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode)
 {
        /* Access the location */
        cave_type               *c_ptr = &cave[y][x];
@@ -3724,7 +3724,7 @@ bool place_monster_aux(IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_F
                for (i = 0; i < 32; i++)
                {
                        POSITION nx, ny, d = 3;
-                       int z; 
+                       MONRACE_IDX z; 
 
                        /* Pick a location */
                        scatter(&ny, &nx, y, x, d, 0);