[modify] #37914 (2.2.1.3) ブレス処理をfire_ball()からfire_breath()に分離。 / Separate fire_breath...

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

diff --git a/src/files.c b/src/files.c
index 450ac35..8d6f218 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -124,7 +124,7 @@ void safe_setuid_grab(void)
  */
 s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode)
 {
-       int i = 0;
+       s16b i = 0;
 
        char *s = buf;
 
@@ -239,7 +239,7 @@ static named_num gf_desc[] =
        {"GF_OLD_SLOW",                 GF_OLD_SLOW                     },
        {"GF_OLD_CONF",                 GF_OLD_CONF                     },
        {"GF_OLD_SLEEP",                        GF_OLD_SLEEP            },
-       {"GF_OLD_DRAIN",                        GF_OLD_DRAIN            },
+       {"GF_HYPODYNAMIA",                      GF_HYPODYNAMIA          },
        {"GF_AWAY_UNDEAD",              GF_AWAY_UNDEAD          },
        {"GF_AWAY_EVIL",                        GF_AWAY_EVIL            },
        {"GF_AWAY_ALL",                 GF_AWAY_ALL                     },
@@ -523,7 +523,7 @@ errr process_pref_file_command(char *buf)
                /* Process "C:<str>" -- create keymap */
                case 'C':
                {
-                       BIT_FLAGS mode;
+                       int mode;
                        char tmp[1024];
 
                        if (tokenize(buf+2, 2, zz, TOKENIZE_CHECKQUOTE) != 2) return 1;
@@ -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;
@@ -4434,13 +4434,13 @@ static void dump_aux_quest(FILE *fff)
        fprintf(fff, _("\n\n  [クエスト情報]\n", "\n\n  [Quest Information]\n"));
 
        /* Allocate Memory */
-       C_MAKE(quest_num, max_quests, IDX);
+       C_MAKE(quest_num, max_q_idx, IDX);
 
        /* Sort by compete level */
-       for (i = 1; i < max_quests; i++) quest_num[i] = i;
+       for (i = 1; i < max_q_idx; i++) quest_num[i] = i;
        ang_sort_comp = ang_sort_comp_quest_num;
        ang_sort_swap = ang_sort_swap_quest_num;
-       ang_sort(quest_num, &dummy, max_quests);
+       ang_sort(quest_num, &dummy, max_q_idx);
 
        /* Dump Quest Information */
        fputc('\n', fff);
@@ -4450,7 +4450,7 @@ static void dump_aux_quest(FILE *fff)
        fputc('\n', fff);
 
        /* Free Memory */
-       C_KILL(quest_num, max_quests, IDX);
+       C_KILL(quest_num, max_q_idx, IDX);
 }
 
 
@@ -6127,7 +6127,7 @@ void do_cmd_save_game(int is_autosave)
        (void)strcpy(p_ptr->died_from, _("(元気に生きている)", "(alive and well)"));
 
        /* HACK -- don't get sanity blast on updating view */
-       hack_mind = FALSE;
+       is_loading_now = FALSE;
 
        /* Update stuff */
        update_stuff();
@@ -6136,7 +6136,7 @@ void do_cmd_save_game(int is_autosave)
        mproc_init();
 
        /* HACK -- reset the hackish flag */
-       hack_mind = TRUE;
+       is_loading_now = TRUE;
 }