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

diff --git a/src/cmd4.c b/src/cmd4.c
index a2079e0..8c351cd 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -6325,13 +6325,13 @@ static void display_group_list(int col, int row, int wid, int per_page,
 /* 
  * Move the cursor in a browser window 
  */
-static void browser_cursor(char ch, int *column, int *grp_cur, int grp_cnt, 
+static void browser_cursor(char ch, int *column, IDX *grp_cur, IDX grp_cnt, 
                                                   IDX *list_cur, IDX list_cnt)
 {
        int d;
        int col = *column;
-       int grp = *grp_cur;
-       int list = *list_cur;
+       IDX grp = *grp_cur;
+       IDX list = *list_cur;
 
        /* Extract direction */
        if (ch == ' ')

diff --git a/src/externs.h b/src/externs.h
index 160a34d..920384e 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1070,7 +1070,7 @@ extern s16b inven_takeoff(int item, int amt);
 extern void inven_drop(int item, int amt);
 extern void combine_pack(void);
 extern void reorder_pack(void);
-extern void display_koff(int k_idx);
+extern void display_koff(IDX k_idx);
 extern object_type *choose_warning_item(void);
 extern bool process_warning(int xx, int yy);
 extern void do_cmd_kaji(bool only_browse);
@@ -1563,17 +1563,6 @@ extern bool do_cmd_mane(bool baigaesi);
 extern bool clean_shot(int y1, int x1, int y2, int x2, bool is_friend);
 extern bool summon_possible(int y1, int x1);
 extern bool raise_possible(monster_type *m_ptr);
-extern bool dispel_check(int m_idx);
-extern bool spell_is_inate(u16b spell);
-extern bool make_attack_spell(int m_idx);
-extern void beam(int m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type);
-extern void bolt(int m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type);
-extern void breath(int y, int x, int m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, int target_type);
-
-/* mspells1.c */
-extern bool clean_shot(int y1, int x1, int y2, int x2, bool is_friend);
-extern bool summon_possible(int y1, int x1);
-extern bool raise_possible(monster_type *m_ptr);
 extern bool dispel_check(IDX m_idx);
 extern bool spell_is_inate(u16b spell);
 extern bool make_attack_spell(IDX m_idx);

diff --git a/src/init1.c b/src/init1.c
index f5d98d5..5c86278 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -3003,7 +3003,7 @@ errr parse_r_info(char *buf, header *head)
                r_ptr->extra = pad;
                r_ptr->mexp = exp;
                r_ptr->next_exp = nextexp;
-               r_ptr->next_r_idx = nextmon;
+               r_ptr->next_r_idx = (IDX)nextmon;
        }
 
        /* Process 'R' for "Reinforcement" (up to six lines) */

diff --git a/src/object2.c b/src/object2.c
index c9179db..eec9f66 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -5502,7 +5502,8 @@ void amusement(int y1, int x1, int num, bool known)
        /* Acquirement */
        while (num)
        {
-               int i, k_idx, a_idx = 0;
+               int i;
+               IDX k_idx, a_idx = 0;
                int r = randint0(t);
                bool insta_art, fixed_art;
 
@@ -6620,7 +6621,7 @@ void reorder_pack(void)
  * @details
  * Include list of usable spells for readible books
  */
-void display_koff(int k_idx)
+void display_koff(IDX k_idx)
 {
        int y;