[Refactor] #37353 型の置換。 / Type replacement.

diff --git a/src/autopick.c b/src/autopick.c
index 0e24f5d..5db90bf 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -453,7 +453,7 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr)
        bool bol_mark = TRUE;
 #endif
 
-       char name_str[MAX_NLEN];
+       GAME_TEXT name_str[MAX_NLEN];
 
        /* Initialize name string */
        name_str[0] = '\0';
@@ -754,7 +754,7 @@ static cptr pickpref_filename(int filename_mode)
  */
 void autopick_load_pref(bool disp_mes)
 {
-       char buf[80];
+       GAME_TEXT buf[80];
        errr err;
 
        /* Free old entries */

diff --git a/src/realm-hex.c b/src/realm-hex.c
index fba010a..83169c5 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -29,7 +29,7 @@
  */
 bool stop_hex_spell_all(void)
 {
-       int i;
+       SPELL_IDX i;
 
        for (i = 0; i < 32; i++)
        {
@@ -166,13 +166,11 @@ void check_hex(void)
                }
        }
 
-
        /* Culcurates final mana cost */
        need_mana_frac = 0;
        s64b_div(&need_mana, &need_mana_frac, 0, 3); /* Divide by 3 */
        need_mana += (CASTING_HEX_NUM(p_ptr) - 1);
 
-
        /* Not enough mana */
        if (s64b_cmp(p_ptr->csp, p_ptr->csp_frac, need_mana, need_mana_frac) < 0)
        {

diff --git a/src/xtra1.c b/src/xtra1.c
index cc56537..a22821d 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -110,7 +110,7 @@ s16b modify_stat_value(int value, int amount)
  * @param col 描画行
  * @return なし
  */
-static void prt_field(cptr info, int row, int col)
+static void prt_field(cptr info, TERM_LEN row, TERM_LEN col)
 {
        /* Dump 13 spaces to clear */
        c_put_str(TERM_WHITE, "             ", row, col);
@@ -168,7 +168,7 @@ cptr map_name(void)
 static void prt_dungeon(void)
 {
        cptr dungeon_name;
-       int col;
+       TERM_LEN col;
 
        /* Dump 13 spaces to clear */
        c_put_str(TERM_WHITE, "             ", ROW_DUNGEON, COL_DUNGEON);
@@ -466,9 +466,10 @@ static struct {
  */
 static void prt_status(void)
 {
-       u32b bar_flags[3];
+       BIT_FLAGS bar_flags[3];
        TERM_LEN wid, hgt, row_statbar, max_col_statbar;
-       int i, col = 0, num = 0;
+       int i;
+       TERM_LEN col = 0, num = 0;
        int space = 2;
 
        Term_get_size(&wid, &hgt);
@@ -700,7 +701,7 @@ static void prt_status(void)
 static void prt_title(void)
 {
        cptr p = "";
-       char str[14];
+       GAME_TEXT str[14];
 
        if (p_ptr->wizard)
        {