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

diff --git a/src/cmd2.c b/src/cmd2.c
index cd464de..42adb5a 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -4618,7 +4618,8 @@ static void travel_flow(int ty, int tx)
  */
 void do_cmd_travel(void)
 {
-       int x, y, i;
+       POSITION x, y;
+       int i;
        int dx, dy, sx, sy;
        feature_type *f_ptr;
 

diff --git a/src/cmd4.c b/src/cmd4.c
index f41b783..603a9e9 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -431,9 +431,9 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                else
                {
 #ifdef JP
-                       sprintf(note_level_buf, "%d階(%s):", dun_level, d_name+d_info[dungeon_type].name);
+                       sprintf(note_level_buf, "%d階(%s):", (int)dun_level, d_name+d_info[dungeon_type].name);
 #else
-                       sprintf(note_level_buf, "%s L%d:", d_name+d_info[dungeon_type].name, dun_level);
+                       sprintf(note_level_buf, "%s L%d:", d_name+d_info[dungeon_type].name, (int)dun_level);
 #endif
                        note_level = note_level_buf;
                }
@@ -507,7 +507,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                case NIKKI_MAXDEAPTH:
                {
                        fprintf(fff, _(" %2d:%02d %20s %sの最深階%d階に到達した。\n",
-                                                  " %2d:%02d %20s reached level %d of %s for the first time.\n"), hour, min, note_level,
+                                                  " %2d:%02d %20s reached level %d of %s for the first time.\n"), hour, min, (int)note_level,
                                                   _(d_name+d_info[dungeon_type].name, num),
                                                   _(num, d_name+d_info[dungeon_type].name));
                        break;
@@ -515,7 +515,7 @@ errr do_cmd_write_nikki(int type, int num, cptr note)
                case NIKKI_TRUMP:
                {
                        fprintf(fff, _(" %2d:%02d %20s %s%sの最深階を%d階にセットした。\n",
-                                                  " %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, note_level, note,
+                                                  " %2d:%02d %20s reset recall level of %s to %d %s.\n"), hour, min, (int)note_level, note,
                                                   _(d_name + d_info[num].name, max_dlv[num]),
                                                   _(max_dlv[num], d_name + d_info[num].name));
                        break;
@@ -5717,7 +5717,7 @@ static void do_cmd_knowledge_uniques(void)
                monster_race *r_ptr = &r_info[who[k]];
 
                /* Print a message */
-               fprintf(fff, _("     %s (レベル%d)\n", "     %s (level %d)\n"), r_name + r_ptr->name, (DEPTH)r_ptr->level);
+               fprintf(fff, _("     %s (レベル%d)\n", "     %s (level %d)\n"), r_name + r_ptr->name, (int)r_ptr->level);
        }
 
        /* Free the "who" array */

diff --git a/src/do-spell.c b/src/do-spell.c
index dc415ae..741d836 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -8675,7 +8675,7 @@ static cptr do_hissatsu_spell(int spell, int mode)
     
                if (cast)
                {
-                       int y, x;
+                       POSITION y, x;
 
                        if (!tgt_pt(&x, &y)) return NULL;
 
@@ -9558,7 +9558,8 @@ static cptr do_hex_spell(int spell, int mode)
                if (desc) return _("モンスターの隣のマスに瞬間移動する。", "Teleports you close to a monster.");
                if (cast)
                {
-                       int i, y, x, dir;
+                       int i, dir;
+                       POSITION y, x;
                        bool flag;
 
                        for (i = 0; i < 3; i++)

diff --git a/src/dungeon.c b/src/dungeon.c
index 6a47a02..f253e3f 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -631,7 +631,7 @@ static void pattern_teleport(void)
                sprintf(ppp, _("テレポート先:(%d-%d)", "Teleport to level (%d-%d): "), min_level, max_level);
 
                /* Default */
-               sprintf(tmp_val, "%d", dun_level);
+               sprintf(tmp_val, "%d", (DEPTH)dun_level);
 
                /* Ask for a level */
                if (!get_string(ppp, tmp_val, 10)) return;

diff --git a/src/effects.c b/src/effects.c
index 8081970..4292447 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -4577,7 +4577,7 @@ int take_hit(int damage_type, HIT_POINT damage, cptr hit_from, int monspell)
                                         !((q_idx == QUEST_OBERON) || (q_idx == QUEST_SERPENT))))
                                        strcpy(buf,_("クエスト", "in a quest"));
                                else
-                                       sprintf(buf,_("%d階", "level %d"), dun_level);
+                                       sprintf(buf,_("%d階", "level %d"), (DEPTH)dun_level);
 
                                sprintf(tmp, _("%sで%sに殺された。", "killed by %s %s."), buf, p_ptr->died_from);
                                do_cmd_write_nikki(NIKKI_BUNSHOU, 0, tmp);

diff --git a/src/files.c b/src/files.c
index 4ed4300..2529d29 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -6159,7 +6159,7 @@ void do_cmd_save_and_exit(void)
 long total_points(void)
 {
        int i, mult = 100;
-       s16b max_dl = 0;
+       DEPTH max_dl = 0;
        u32b point, point_h, point_l;
        int arena_win = MIN(p_ptr->arena_number, MAX_ARENA_MONS);
 

diff --git a/src/types.h b/src/types.h
index bb0af21..4fd01ff 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -214,14 +214,14 @@ struct ego_item_type
        byte slot;                      /* Standard slot value */
        byte rating;            /* Rating boost */
 
-       byte level;                     /* Minimum level */
-       byte rarity;            /* Object rarity */
+       DEPTH level;                    /* Minimum level */
+       RARITY rarity;          /* Object rarity */
 
        byte max_to_h;          /* Maximum to-hit bonus */
        byte max_to_d;          /* Maximum to-dam bonus */
        byte max_to_a;          /* Maximum to-ac bonus */
 
-       byte max_pval;          /* Maximum pval */
+       PARAMETER_VALUE max_pval;               /* Maximum pval */
 
        s32b cost;                      /* Ego-item "cost" */
 
@@ -229,7 +229,7 @@ struct ego_item_type
 
        u32b gen_flags;         /* flags for generate */
 
-       byte act_idx;           /* Activative ability index */
+       IDX act_idx;            /* Activative ability index */
 };
 
 

diff --git a/src/wizard1.c b/src/wizard1.c
index e6de357..04b8d95 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -2500,7 +2500,7 @@ static void spoil_mon_evol(cptr fname)
                        fprintf(fff, "[%d]: ", r_ptr->next_r_idx);
                        r_ptr = &r_info[r_ptr->next_r_idx];
                        fprintf(fff, _("%s (レベル%d, '%c')\n", "%s (Level %d, '%c')\n"),
-                               r_name + r_ptr->name, r_ptr->level, r_ptr->d_char);
+                               r_name + r_ptr->name, (int)r_ptr->level, r_ptr->d_char);
                }
 
                /* End of evolution tree */

diff --git a/src/wizard2.c b/src/wizard2.c
index e28d87f..84f4cf7 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -873,7 +873,7 @@ static void wiz_tweak_item(object_type *o_ptr)
        wiz_display_item(o_ptr);
 
        p = "Enter new 'to_d' setting: ";
-       sprintf(tmp_val, "%d", o_ptr->to_d);
+       sprintf(tmp_val, "%d", (int)o_ptr->to_d);
        if (!get_string(p, tmp_val, 5)) return;
        o_ptr->to_d = (s16b)atoi(tmp_val);
        wiz_display_item(o_ptr);
@@ -1560,7 +1560,7 @@ static void do_cmd_wiz_jump(void)
                sprintf(ppp, "Jump to level (0, %d-%d): ", d_info[tmp_dungeon_type].mindepth, d_info[tmp_dungeon_type].maxdepth);
 
                /* Default */
-               sprintf(tmp_val, "%d", dun_level);
+               sprintf(tmp_val, "%d", (int)dun_level);
 
                /* Ask for a level */
                if (!get_string(ppp, tmp_val, 10)) return;
@@ -1777,7 +1777,7 @@ static void do_cmd_wiz_create_feature(void)
        feature_type *f_ptr;
        char         tmp_val[160];
        int          tmp_feat, tmp_mimic;
-       int          y, x;
+       POSITION y, x;
 
        if (!tgt_pt(&x, &y)) return;
 

diff --git a/src/xtra2.c b/src/xtra2.c
index 10c9341..f03641d 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -5146,7 +5146,7 @@ msg_format("%sはあなたを無視した。",
  * XAngband: determine if a given location is "interesting"
  * based on target_set_accept function.
  */
-static bool tgt_pt_accept(int y, int x)
+static bool tgt_pt_accept(POSITION y, POSITION x)
 {
        cave_type *c_ptr;
 
@@ -5185,7 +5185,7 @@ static bool tgt_pt_accept(int y, int x)
  */
 static void tgt_pt_prepare(void)
 {
-       int y, x;
+       POSITION y, x;
 
        /* Reset "temp" array */
        temp_n = 0;