#37287 #37353 (2.2.0.89) COMMAND_NUM 型を定義し、型の置換を継続中。 / Define COMMAND_NUM, ongoing...

[hengband/hengband.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index ae25b2c..07e1218 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -122,9 +122,9 @@ void safe_setuid_grab(void)
  * Hack -- We will always extract at least one token
  * </pre>
  */
-s16b tokenize(char *buf, s16b num, char **tokens, int mode)
+s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode)
 {
-       int i = 0;
+       s16b i = 0;
 
        char *s = buf;
 
@@ -381,8 +381,8 @@ errr process_pref_file_command(char *buf)
                        {
                                monster_race *r_ptr;
                                i = (huge)strtol(zz[0], NULL, 0);
-                               n1 = strtol(zz[1], NULL, 0);
-                               n2 = strtol(zz[2], NULL, 0);
+                               n1 = (SYMBOL_COLOR)strtol(zz[1], NULL, 0);
+                               n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
                                if (i >= max_r_idx) return 1;
                                r_ptr = &r_info[i];
                                if (n1 || (!(n2 & 0x80) && n2)) r_ptr->x_attr = n1; /* Allow TERM_DARK text */
@@ -397,8 +397,8 @@ errr process_pref_file_command(char *buf)
                        {
                                object_kind *k_ptr;
                                i = (huge)strtol(zz[0], NULL, 0);
-                               n1 = strtol(zz[1], NULL, 0);
-                               n2 = strtol(zz[2], NULL, 0);
+                               n1 = (SYMBOL_COLOR)strtol(zz[1], NULL, 0);
+                               n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
                                if (i >= max_k_idx) return 1;
                                k_ptr = &k_info[i];
                                if (n1 || (!(n2 & 0x80) && n2)) k_ptr->x_attr = n1; /* Allow TERM_DARK text */
@@ -423,8 +423,8 @@ errr process_pref_file_command(char *buf)
                                if (i >= max_f_idx) return 1;
                                f_ptr = &f_info[i];
 
-                               n1 = strtol(zz[1], NULL, 0);
-                               n2 = strtol(zz[2], NULL, 0);
+                               n1 = (SYMBOL_COLOR)strtol(zz[1], NULL, 0);
+                               n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
                                if (n1 || (!(n2 & 0x80) && n2)) f_ptr->x_attr[F_LIT_STANDARD] = n1; /* Allow TERM_DARK text */
                                if (n2) f_ptr->x_char[F_LIT_STANDARD] = n2;
 
@@ -451,8 +451,8 @@ errr process_pref_file_command(char *buf)
                                case F_LIT_MAX * 2 + 1:
                                        for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
                                        {
-                                               n1 = strtol(zz[j * 2 + 1], NULL, 0);
-                                               n2 = strtol(zz[j * 2 + 2], NULL, 0);
+                                               n1 = (SYMBOL_COLOR)strtol(zz[j * 2 + 1], NULL, 0);
+                                               n2 = (SYMBOL_CODE)strtol(zz[j * 2 + 2], NULL, 0);
                                                if (n1 || (!(n2 & 0x80) && n2)) f_ptr->x_attr[j] = n1; /* Allow TERM_DARK text */
                                                if (n2) f_ptr->x_char[j] = n2;
                                        }
@@ -466,8 +466,8 @@ errr process_pref_file_command(char *buf)
                        if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
                        {
                                j = (byte)strtol(zz[0], NULL, 0);
-                               n1 = strtol(zz[1], NULL, 0);
-                               n2 = strtol(zz[2], NULL, 0);
+                               n1 = (SYMBOL_COLOR)strtol(zz[1], NULL, 0);
+                               n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
                                misc_to_attr[j] = n1;
                                misc_to_char[j] = n2;
                                return 0;
@@ -479,8 +479,8 @@ errr process_pref_file_command(char *buf)
                        if (tokenize(buf+2, 3, zz, TOKENIZE_CHECKQUOTE) == 3)
                        {
                                j = (huge)strtol(zz[0], NULL, 0);
-                               n1 = strtol(zz[1], NULL, 0);
-                               n2 = strtol(zz[2], NULL, 0);
+                               n1 = (SYMBOL_COLOR)strtol(zz[1], NULL, 0);
+                               n2 = (SYMBOL_CODE)strtol(zz[2], NULL, 0);
                                for (i = 1; i < max_k_idx; i++)
                                {
                                        object_kind *k_ptr = &k_info[i];
@@ -499,7 +499,7 @@ errr process_pref_file_command(char *buf)
                        if (tokenize(buf+2, 2, zz, TOKENIZE_CHECKQUOTE) == 2)
                        {
                                j = (byte)strtol(zz[0], NULL, 0) % 128;
-                               n1 = strtol(zz[1], NULL, 0);
+                               n1 = (SYMBOL_COLOR)strtol(zz[1], NULL, 0);
                                if (n1) tval_to_attr[j] = n1;
                                return 0;
                        }
@@ -2030,7 +2030,7 @@ static void display_player_various(void)
        /* If the player is wielding one? */
        if (o_ptr->k_idx)
        {
-               s16b energy_fire = bow_energy(o_ptr->sval);
+               ENERGY energy_fire = bow_energy(o_ptr->sval);
 
                /* Calculate shots per round */
                shots = p_ptr->num_fire * 100;
@@ -3783,7 +3783,7 @@ c_put_str(TERM_YELLOW, "現在", row, stat_col+35);
  * Mode 4 = mutations
  * </pre>
  */
-void display_player(int mode)
+void display_player(BIT_FLAGS mode)
 {
        int i;
 
@@ -4409,9 +4409,9 @@ static void dump_aux_class_special(FILE *fff)
                for (i = 0; i < row; i++)
                {
                        fprintf(fff, "\n");
-                       fprintf(fff, "%-11s %5d     ", essence_name[id[i]], p_ptr->magic_num1[id[i]]);
-                       if(i + row < n) fprintf(fff, "%-11s %5d     ", essence_name[id[i + row]], p_ptr->magic_num1[id[i + row]]);
-                       if(i + row * 2 < n) fprintf(fff, "%-11s %5d", essence_name[id[i + row * 2]], p_ptr->magic_num1[id[i + row * 2]]);
+                       fprintf(fff, "%-11s %5d     ", essence_name[id[i]], (int)p_ptr->magic_num1[id[i]]);
+                       if(i + row < n) fprintf(fff, "%-11s %5d     ", essence_name[id[i + row]], (int)p_ptr->magic_num1[id[i + row]]);
+                       if(i + row * 2 < n) fprintf(fff, "%-11s %5d", essence_name[id[i + row * 2]], (int)p_ptr->magic_num1[id[i + row * 2]]);
                }
 
                fputs("\n", fff);
@@ -5194,7 +5194,7 @@ static void show_file_aux_line(cptr str, int cy, cptr shower)
  * Return FALSE on 'q' to exit from a deep, otherwise TRUE.
  * </pre>
  */
-bool show_file(bool show_version, cptr name, cptr what, int line, int mode)
+bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode)
 {
        int i, n, skey;