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

diff --git a/src/cmd4.c b/src/cmd4.c
index e753e27..b5e0ebc 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -3088,7 +3088,7 @@ static cptr lighting_level_str[F_LIT_MAX] =
  * @param max ビジュアルIDの最大数
  * @return 指定が実際に行われた場合TRUE、キャンセルされた場合FALSE
  */
-static bool cmd_visuals_aux(int i, int *num, IDX max)
+static bool cmd_visuals_aux(int i, IDX *num, IDX max)
 {
        if (iscntrl(i))
        {
@@ -3151,7 +3151,7 @@ static void do_cmd_knowledge_features(bool *need_redraw, bool visual_only, IDX d
  */
 void do_cmd_visuals(void)
 {
-       int i;
+       char i;
        char tmp[160];
        char buf[1024];
        bool need_redraw = FALSE;
@@ -3436,7 +3436,7 @@ void do_cmd_visuals(void)
                                {
                                case 'n':
                                        {
-                                               int prev_r = r;
+                                               IDX prev_r = r;
                                                do
                                                {
                                                        if (!cmd_visuals_aux(i, &r, max_r_idx))
@@ -3529,7 +3529,7 @@ void do_cmd_visuals(void)
                                {
                                case 'n':
                                        {
-                                               int prev_k = k;
+                                               IDX prev_k = k;
                                                do
                                                {
                                                        if (!cmd_visuals_aux(i, &k, max_k_idx))
@@ -4316,7 +4316,8 @@ static bool ang_sort_comp_monster_level(vptr u, vptr v, int a, int b)
  */
 static int collect_monsters(int grp_cur, IDX mon_idx[], BIT_FLAGS8 mode)
 {
-       int i, mon_cnt = 0;
+       IDX i;
+       int mon_cnt = 0;
        int dummy_why;
 
        /* Get a list of x_char in this group */

diff --git a/src/init1.c b/src/init1.c
index d917922..79ba33e 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -2217,9 +2217,9 @@ errr parse_k_info(char *buf, header *head)
                                &tval, &sval, &pval)) return (1);
 
                /* Save the values */
-               k_ptr->tval = tval;
-               k_ptr->sval = sval;
-               k_ptr->pval = pval;
+               k_ptr->tval = (OBJECT_TYPE_VALUE)tval;
+               k_ptr->sval = (OBJECT_SUBTYPE_VALUE)sval;
+               k_ptr->pval = (PARAMETER_VALUE)pval;
        }
 
        /* Process 'W' for "More Info" (one line only) */

diff --git a/src/monster2.c b/src/monster2.c
index 31fc69e..ddd9953 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -3038,7 +3038,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(int who, int y, int x, int r_idx, u32b mode)
+static bool place_monster_one(IDX who, POSITION y, POSITION x, IDX r_idx, BIT_FLAGS mode)
 {
        /* Access the location */
        cave_type               *c_ptr = &cave[y][x];

diff --git a/src/types.h b/src/types.h
index afadd74..855914f 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -106,8 +106,8 @@ struct object_kind
        STR_OFFSET text;                        /*!< 解説テキスト参照のためのネームバッファオフセット値 / Text (offset) */
        STR_OFFSET flavor_name; /*!< 未確定名参照のためのネームバッファオフセット値 / Flavor name (offset) */
 
-       byte tval;                      /*!< ベースアイテム種別の大項目値 Object type */
-       byte sval;                      /*!< ベースアイテム種別の小項目値 Object sub type */
+       OBJECT_TYPE_VALUE tval;                 /*!< ベースアイテム種別の大項目値 Object type */
+       OBJECT_SUBTYPE_VALUE sval;                      /*!< ベースアイテム種別の小項目値 Object sub type */
 
        PARAMETER_VALUE pval;   /*!< ベースアイテムのpval（能力修正共通値） Object extra info */
 

diff --git a/src/variable.c b/src/variable.c
index 65039e2..08bfa75 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -1155,8 +1155,8 @@ u32b mon_odds[4];
 int pet_t_m_idx;
 int riding_t_m_idx;
 
-s16b kubi_r_idx[MAX_KUBI];
-s16b today_mon;
+IDX kubi_r_idx[MAX_KUBI];
+IDX today_mon;
 
 bool write_level;
 

diff --git a/src/xtra2.c b/src/xtra2.c
index 905814b..aea7fc2 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2720,7 +2720,7 @@ static void ang_sort_swap_distance(vptr u, vptr v, int a, int b)
 /*
  * Hack -- help "select" a location (see below)
  */
-static s16b target_pick(int y1, int x1, int dy, int dx)
+static s16b target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION dx)
 {
        int i, v;