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

diff --git a/src/bldg.c b/src/bldg.c
index 9a6882c..91dcb3d 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4799,7 +4799,7 @@ void quest_discovery(int q_idx)
  * @param level 検索対象になる階
  * @return クエストIDを返す。該当がない場合0を返す。
  */
-int quest_number(int level)
+IDX quest_number(DEPTH level)
 {
        int i;
 
@@ -4827,7 +4827,7 @@ int quest_number(int level)
  * @param level 検索対象になる階
  * @return クエストIDを返す。該当がない場合0を返す。
  */
-int random_quest_number(int level)
+IDX random_quest_number(DEPTH level)
 {
        int i;
 

diff --git a/src/cmd2.c b/src/cmd2.c
index 45b5d4f..cd464de 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -3648,12 +3648,12 @@ void do_cmd_fire_aux(int item, object_type *j_ptr)
                                        if (snipe_type == SP_RUSH)
                                        {
                                                int n = randint1(5) + 3;
-                                               int m_idx = c_mon_ptr->m_idx;
+                                               IDX m_idx = c_mon_ptr->m_idx;
 
                                                for ( ; cur_dis <= tdis; )
                                                {
-                                                       int ox = nx;
-                                                       int oy = ny;
+                                                       POSITION ox = nx;
+                                                       POSITION oy = ny;
 
                                                        if (!n) break;
 

diff --git a/src/do-spell.c b/src/do-spell.c
index 9e665f6..dc415ae 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -6951,7 +6951,7 @@ static cptr do_crusade_spell(int spell, int mode)
                                for (i = 0; i < 12; i++)
                                {
                                        int attempt = 10;
-                                       int my = 0, mx = 0;
+                                       POSITION my = 0, mx = 0;
 
                                        while (attempt--)
                                        {

diff --git a/src/externs.h b/src/externs.h
index 8ad2aca..2cfb603 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -521,18 +521,18 @@ extern bool monk_armour_aux;
 extern bool monk_notify_aux;
 extern wilderness_type **wilderness;
 extern building_type building[MAX_BLDG];
-extern u16b max_quests;
-extern u16b max_r_idx;
-extern u16b max_k_idx;
-extern u16b max_v_idx;
-extern u16b max_f_idx;
-extern u16b max_a_idx;
-extern u16b max_e_idx;
-extern u16b max_d_idx;
-extern u16b max_o_idx;
-extern u16b max_m_idx;
-extern s32b max_wild_x;
-extern s32b max_wild_y;
+extern IDX max_quests;
+extern IDX max_r_idx;
+extern IDX max_k_idx;
+extern IDX max_v_idx;
+extern IDX max_f_idx;
+extern IDX max_a_idx;
+extern IDX max_e_idx;
+extern IDX max_d_idx;
+extern IDX max_o_idx;
+extern IDX max_m_idx;
+extern POSITION max_wild_x;
+extern POSITION max_wild_y;
 extern quest_type *quest;
 extern char quest_text[10][80];
 extern int quest_text_line;
@@ -1041,7 +1041,7 @@ extern bool object_similar(object_type *o_ptr, object_type *j_ptr);
 extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
 extern s16b lookup_kind(int tval, int sval);
 extern void object_wipe(object_type *o_ptr);
-extern void object_prep(object_type *o_ptr, int k_idx);
+extern void object_prep(object_type *o_ptr, IDX k_idx);
 extern void object_copy(object_type *o_ptr, object_type *j_ptr);
 extern void apply_magic(object_type *o_ptr, int lev, u32b mode);
 extern bool make_object(object_type *j_ptr, u32b mode);
@@ -1298,8 +1298,8 @@ extern void battle_monsters(void);
 extern void do_cmd_bldg(void);
 extern void do_cmd_quest(void);
 extern void quest_discovery(int q_idx);
-extern int quest_number(int level);
-extern int random_quest_number(int level);
+extern IDX quest_number(DEPTH level);
+extern IDX random_quest_number(DEPTH level);
 extern bool tele_town(void);
 extern s16b calc_crit_ratio_shot(int plus_ammo,int plus_bow);
 extern s16b calc_expect_crit_shot(int weight, int plus_ammo,int plus_bow, int dam);

diff --git a/src/floors.c b/src/floors.c
index fa90359..e0fc8fb 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -691,7 +691,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;
+       IDX m_idx = cave[oy][ox].m_idx;
 
        /* Nothing to do if no monster */
        if (!m_idx) return;

diff --git a/src/object2.c b/src/object2.c
index 68b1c26..1692213 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -1932,7 +1932,7 @@ void object_copy(object_type *o_ptr, object_type *j_ptr)
  * @param k_idx 新たに作成したいベースアイテム情報のID
  * @return なし
  */
-void object_prep(object_type *o_ptr, int k_idx)
+void object_prep(object_type *o_ptr, IDX k_idx)
 {
        object_kind *k_ptr = &k_info[k_idx];
 

diff --git a/src/spells1.c b/src/spells1.c
index 012f6e4..27c6deb 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -6814,10 +6814,10 @@ bool project(int who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int t
        int grids = 0;
 
        /* Coordinates of the affected grids */
-       byte gx[1024], gy[1024];
+       POSITION gx[1024], gy[1024];
 
        /* Encoded "radius" info (see above) */
-       byte gm[32];
+       POSITION gm[32];
 
        /* Actual radius encoded in gm[] */
        int gm_rad = rad;

diff --git a/src/variable.c b/src/variable.c
index 5b2f680..b8512ca 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -1049,58 +1049,58 @@ building_type building[MAX_BLDG];
 /*
  * Maximum number of quests
  */
-u16b max_quests;
+IDX max_quests;
 
 /*
  * Maximum number of monsters in r_info.txt
  */
-u16b max_r_idx;
+IDX max_r_idx;
 
 /*
  * Maximum number of items in k_info.txt
  */
-u16b max_k_idx;
+IDX max_k_idx;
 
 /*
  * Maximum number of vaults in v_info.txt
  */
-u16b max_v_idx;
+IDX max_v_idx;
 
 /*
  * Maximum number of terrain features in f_info.txt
  */
-u16b max_f_idx;
+IDX max_f_idx;
 
 /*
  * Maximum number of artifacts in a_info.txt
  */
-u16b max_a_idx;
+IDX max_a_idx;
 
 /*
  * Maximum number of ego-items in e_info.txt
  */
-u16b max_e_idx;
+IDX max_e_idx;
 
 /*
  * Maximum number of dungeon in e_info.txt
  */
-u16b max_d_idx;
+IDX max_d_idx;
 
 /*
  * Maximum number of objects in the level
  */
-u16b max_o_idx;
+IDX max_o_idx;
 
 /*
  * Maximum number of monsters in the level
  */
-u16b max_m_idx;
+IDX max_m_idx;
 
 /*
  * Maximum size of the wilderness
  */
-s32b max_wild_x;
-s32b max_wild_y;
+POSITION max_wild_x;
+POSITION max_wild_y;
 
 /*
  * Quest info