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

diff --git a/src/externs.h b/src/externs.h
index 8279db5..1b648de 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -553,8 +553,8 @@ extern int sel_monster;
 extern int battle_odds;
 extern int kakekin;
 extern u32b mon_odds[4];
-extern int pet_t_m_idx;
-extern int riding_t_m_idx;
+extern MONSTER_IDX pet_t_m_idx;
+extern MONSTER_IDX riding_t_m_idx;
 extern s16b kubi_r_idx[MAX_KUBI];
 extern s16b today_mon;
 extern bool write_level;

diff --git a/src/init1.c b/src/init1.c
index 4155590..f284d43 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -2977,9 +2977,9 @@ errr parse_r_info(char *buf, header *head)
                                &spd, &hp1, &hp2, &aaf, &ac, &slp)) return (1);
 
                /* Save the values */
-               r_ptr->speed = spd;
-               r_ptr->hdice = MAX(hp1, 1);
-               r_ptr->hside = MAX(hp2, 1);
+               r_ptr->speed = (SPEED)spd;
+               r_ptr->hdice = (DICE_NUMBER)MAX(hp1, 1);
+               r_ptr->hside = (DICE_SID)MAX(hp2, 1);
                r_ptr->aaf = aaf;
                r_ptr->ac = (ARMOUR_CLASS)ac;
                r_ptr->sleep = slp;

diff --git a/src/mspells1.c b/src/mspells1.c
index 2f209ed..80f62e9 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1462,8 +1462,8 @@ bool make_attack_spell(MONSTER_IDX m_idx)
        POSITION y = p_ptr->y;
 
        /* Target location for lite breath */
-       int x_br_lite = 0;
-       int y_br_lite = 0;
+       POSITION x_br_lite = 0;
+       POSITION y_br_lite = 0;
 
        /* Extract the "see-able-ness" */
     bool seen = (!p_ptr->blind && m_ptr->ml);

diff --git a/src/rooms.c b/src/rooms.c
index e70db01..320b467 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -2475,7 +2475,7 @@ static bool build_type6(void)
        int y, x, y1, x1, y2, x2, xval, yval;
        int i, j;
 
-       int what[16];
+       MONRACE_IDX what[16];
 
        monster_type align;
 

diff --git a/src/spells2.c b/src/spells2.c
index 7ef4877..7478f88 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -2582,7 +2582,8 @@ bool detect_monsters_string(int range, cptr Match)
  */
 bool detect_monsters_xxx(int range, u32b match_flag)
 {
-       int  i, y, x;
+       MONSTER_IDX i;
+       POSITION y, x;
        bool flag = FALSE;
        cptr desc_monsters = _("変なモンスター", "weird monsters");
 

diff --git a/src/variable.c b/src/variable.c
index 0f379c4..50fcd11 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -1152,8 +1152,8 @@ int battle_odds;
 int kakekin;
 u32b mon_odds[4];
 
-int pet_t_m_idx;
-int riding_t_m_idx;
+MONSTER_IDX pet_t_m_idx;
+MONSTER_IDX riding_t_m_idx;
 
 IDX kubi_r_idx[MAX_KUBI];
 IDX today_mon;