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

diff --git a/src/dungeon.c b/src/dungeon.c
index b91892e..3655c66 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -600,8 +600,8 @@ static void sense_inventory2(void)
  */
 static void pattern_teleport(void)
 {
-       int min_level = 0;
-       int max_level = 99;
+       DEPTH min_level = 0;
+       DEPTH max_level = 99;
 
        /* Ask for level */
        if (get_check(_("他の階にテレポートしますか？", "Teleport level? ")))
@@ -637,7 +637,7 @@ static void pattern_teleport(void)
                if (!get_string(ppp, tmp_val, 10)) return;
 
                /* Extract request */
-               command_arg = atoi(tmp_val);
+               command_arg = (COMMAND_ARG)atoi(tmp_val);
        }
        else if (get_check(_("通常テレポート？", "Normal teleport? ")))
        {
@@ -650,10 +650,10 @@ static void pattern_teleport(void)
        }
 
        /* Paranoia */
-       if (command_arg < min_level) command_arg = min_level;
+       if (command_arg < min_level) command_arg = (COMMAND_ARG)min_level;
 
        /* Paranoia */
-       if (command_arg > max_level) command_arg = max_level;
+       if (command_arg > max_level) command_arg = (COMMAND_ARG)max_level;
 
        /* Accept request */
        msg_format(_("%d 階にテレポートしました。", "You teleport to dungeon level %d."), command_arg);

diff --git a/src/externs.h b/src/externs.h
index 2eee8e8..d2d30ef 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1259,7 +1259,7 @@ extern int mod_spell_chance_1(int chance);
 extern int mod_spell_chance_2(int chance);
 extern s16b spell_chance(int spell,int realm);
 extern bool spell_okay(int spell, bool learned, bool study_pray, int realm);
-extern void print_spells(int target_spell, int *spells, int num, TERM_POSITION y, TERM_POSITION x, int realm);
+extern void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_POSITION y, TERM_POSITION x, REALM_IDX realm);
 extern bool hates_acid(object_type *o_ptr);
 extern bool hates_elec(object_type *o_ptr);
 extern bool hates_fire(object_type *o_ptr);
@@ -1653,8 +1653,8 @@ extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype);
 #ifdef ALLOW_REPEAT /* TNB */
 
 /* util.c */
-extern void repeat_push(IDX what);
-extern bool repeat_pull(IDX *what);
+extern void repeat_push(COMMAND_CODE what);
+extern bool repeat_pull(COMMAND_CODE *what);
 extern void repeat_check(void);
 
 #endif /* ALLOW_REPEAT -- TNB */

diff --git a/src/object1.c b/src/object1.c
index f03f4e4..0747557 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1319,10 +1319,10 @@ char index_to_label(int i)
  */
 INVENTORY_IDX label_to_inven(int c)
 {
-       int i;
+       INVENTORY_IDX i;
 
        /* Convert */
-       i = (islower(c) ? A2I(c) : -1);
+       i = (INVENTORY_IDX)(islower(c) ? A2I(c) : -1);
 
        /* Verify the index */
        if ((i < 0) || (i > INVEN_PACK)) return (-1);
@@ -1357,10 +1357,10 @@ static bool is_ring_slot(int i)
  */
 INVENTORY_IDX label_to_equip(int c)
 {
-       int i;
+       INVENTORY_IDX i;
 
        /* Convert */
-       i = (islower(c) ? A2I(c) : -1) + INVEN_RARM;
+       i = (INVENTORY_IDX)(islower(c) ? A2I(c) : -1) + INVEN_RARM;
 
        /* Verify the index */
        if ((i < INVEN_RARM) || (i >= INVEN_TOTAL)) return (-1);

diff --git a/src/object2.c b/src/object2.c
index d3bb0de..6183b6c 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -4755,7 +4755,7 @@ static bool kind_is_good(int k_idx)
 bool make_object(object_type *j_ptr, BIT_FLAGS mode)
 {
        int prob, base;
-       byte obj_level;
+       DEPTH obj_level;
 
 
        /* Chance of "special object" */
@@ -6154,7 +6154,7 @@ bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr)
  */
 s16b inven_carry(object_type *o_ptr)
 {
-       int i, j, k;
+       INVENTORY_IDX i, j, k;
        int n = -1;
 
        object_type *j_ptr;

diff --git a/src/rooms.c b/src/rooms.c
index b010856..e19c804 100644 (file)
--- a/src/rooms.c
+++ b/src/rooms.c
@@ -400,7 +400,7 @@ static bool find_space_aux(int blocks_high, int blocks_wide, int block_y, int bl
  * Return TRUE and values for the center of the room if all went well.\n
  * Otherwise, return FALSE.\n
  */
-static bool find_space(int *y, int *x, int height, int width)
+static bool find_space(POSITION *y, POSITION *x, POSITION height, POSITION width)
 {
        int candidates, pick;
        int by, bx, by1, bx1, by2, bx2;
@@ -521,8 +521,8 @@ static bool find_space(int *y, int *x, int height, int width)
  */
 static bool build_type1(void)
 {
-       int y, x, y2, x2, yval, xval;
-       int y1, x1, xsize, ysize;
+       POSITION y, x, y2, x2, yval, xval;
+       POSITION y1, x1, xsize, ysize;
 
        bool light;
 
@@ -716,9 +716,9 @@ static bool build_type1(void)
  */
 static bool build_type2(void)
 {
-       int                     y, x, xval, yval;
-       int                     y1a, x1a, y2a, x2a;
-       int                     y1b, x1b, y2b, x2b;
+       POSITION        y, x, xval, yval;
+       POSITION        y1a, x1a, y2a, x2a;
+       POSITION        y1b, x1b, y2b, x2b;
        bool            light;
        cave_type   *c_ptr;
 
@@ -840,10 +840,10 @@ static bool build_type2(void)
  */
 static bool build_type3(void)
 {
-       int                     y, x, dy, dx, wy, wx;
-       int                     y1a, x1a, y2a, x2a;
-       int                     y1b, x1b, y2b, x2b;
-       int                     yval, xval;
+       POSITION y, x, dy, dx, wy, wx;
+       POSITION y1a, x1a, y2a, x2a;
+       POSITION y1b, x1b, y2b, x2b;
+       POSITION yval, xval;
        bool            light;
        cave_type   *c_ptr;
 
@@ -3006,9 +3006,9 @@ static bool build_type7(void)
 {
        vault_type *v_ptr = NULL;
        int dummy;
-       int x, y;
-       int xval, yval;
-       int xoffset, yoffset;
+       POSITION x, y;
+       POSITION xval, yval;
+       POSITION xoffset, yoffset;
        int transno;
 
        /* Pick a lesser vault */
@@ -3816,7 +3816,8 @@ static bool generate_fracave(int y0, int x0, int xsize, int ysize, int cutoff, b
  */
 static bool build_type9(void)
 {
-       int grd, roug, cutoff, xsize, ysize, y0, x0;
+       int grd, roug, cutoff;
+       POSITION xsize, ysize, y0, x0;
 
        bool done, light, room;
 
@@ -5962,8 +5963,8 @@ static bool build_type13(void)
  */
 static bool build_type14(void)
 {
-       int y, x, y2, x2, yval, xval;
-       int y1, x1, xsize, ysize;
+       POSITION y, x, y2, x2, yval, xval;
+       POSITION y1, x1, xsize, ysize;
 
        bool light;
 

diff --git a/src/spells2.c b/src/spells2.c
index 7478f88..846d534 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4100,7 +4100,7 @@ bool earthquake(int cy, int cx, int r)
  */
 void discharge_minion(void)
 {
-       int i;
+       MONSTER_IDX i;
        bool okay = TRUE;
 
        for (i = 1; i < m_max; i++)

diff --git a/src/spells3.c b/src/spells3.c
index c41e464..1d32ebd 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -4113,7 +4113,7 @@ bool spell_okay(int spell, bool learned, bool study_pray, int use_realm)
  * @param use_realm 魔法領域ID
  * @return なし
  */
-void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_POSITION y, TERM_POSITION x, int use_realm)
+void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_POSITION y, TERM_POSITION x, REALM_IDX use_realm)
 {
        int             i, spell, exp_level, increment = 64;
        const magic_type *s_ptr;

diff --git a/src/types.h b/src/types.h
index 4fbb493..cfe8741 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1109,7 +1109,7 @@ struct player_type
        MAGIC_NUM2 magic_num2[108];     /*!< Flags for non-spellbook type magics */
 
        s16b mane_spell[MAX_MANE];
-       s16b mane_dam[MAX_MANE];
+       HIT_POINT mane_dam[MAX_MANE];
        s16b mane_num;
 
        s16b concent;      /* Sniper's concentration level */

diff --git a/src/util.c b/src/util.c
index 2f2150a..b4dfea1 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -4865,7 +4865,7 @@ static int repeat__idx = 0;
 static int repeat__key[REPEAT_MAX];
 
 
-void repeat_push(IDX what)
+void repeat_push(COMMAND_CODE what)
 {
        /* Too many keys */
        if (repeat__cnt == REPEAT_MAX) return;
@@ -4878,7 +4878,7 @@ void repeat_push(IDX what)
 }
 
 
-bool repeat_pull(IDX *what)
+bool repeat_pull(COMMAND_CODE *what)
 {
        /* All out of keys */
        if (repeat__idx == repeat__cnt) return (FALSE);
@@ -4892,7 +4892,7 @@ bool repeat_pull(IDX *what)
 
 void repeat_check(void)
 {
-       int             what;
+       COMMAND_CODE what;
 
        /* Ignore some commands */
        if (command_cmd == ESCAPE) return;

diff --git a/src/wizard2.c b/src/wizard2.c
index 1105b44..eeb1ed0 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -233,7 +233,7 @@ static void prt_binary(u32b flags, int row, int col)
  * @param col 表示行
  * @return なし
  */
-static void prt_alloc(byte tval, byte sval, int row, int col)
+static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_POSITION row, TERM_POSITION col)
 {
        int i, j;
        int home = 0;