[Refactor] #37353 マジックナンバー修正(A_MAX) / Fix magic number (A_MAX).

diff --git a/src/birth.c b/src/birth.c
index 2082953..0bbbad8 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -506,8 +506,6 @@ static void birth_quit(void)
 static void show_help(cptr helpfile)
 {
        screen_save();
-
-       /* Peruse the help file */
        (void)show_file(TRUE, helpfile, NULL, 0, 0);
        screen_load();
 }
@@ -837,7 +835,7 @@ static bool get_player_realms(void)
 
                        roff_to_buf(realm_jouhou[technic2magic(p_ptr->realm2)-1], 74, temp, sizeof(temp));
                        t = temp;
-                       for (i = 0; i < 6; i++)
+                       for (i = 0; i < A_MAX; i++)
                        {
                                if(t[0] == 0)
                                        break; 
@@ -891,7 +889,7 @@ static void save_prev_data(birther *birther_ptr)
        birther_ptr->au = p_ptr->au;
 
        /* Save the stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                birther_ptr->stat_max[i] = p_ptr->stat_max[i];
                birther_ptr->stat_max_max[i] = p_ptr->stat_max_max[i];
@@ -950,7 +948,7 @@ static void load_prev_data(bool swap)
        p_ptr->au = previous_char.au;
 
        /* Load the stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                p_ptr->stat_cur[i] = p_ptr->stat_max[i] = previous_char.stat_max[i];
                p_ptr->stat_max_max[i] = previous_char.stat_max_max[i];
@@ -1106,15 +1104,14 @@ static void get_stats(void)
  */
 void get_max_stats(void)
 {
-       int             i, j;
-
-       int             dice[6];
+       int i, j;
+       int dice[6];
 
        /* Roll and verify some stats */
        while (TRUE)
        {
                /* Roll some dice */
-               for (j = i = 0; i < 6; i++)
+               for (j = i = 0; i < A_MAX; i++)
                {
                        /* Roll the dice */
                        dice[i] = randint1(7);
@@ -1128,7 +1125,7 @@ void get_max_stats(void)
        }
 
        /* Acquire the stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                BASE_STATUS max_max = 18 + 60 + dice[i]*10;
 
@@ -1513,7 +1510,7 @@ static void get_money(void)
          gold += 2000;
 
        /* Process the stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                /* Mega-Hack -- reduce gold for high stats */
                if (p_ptr->stat_max[i] >= 18 + 50) gold -= 300;
@@ -1554,7 +1551,7 @@ static void birth_put_stats(void)
        {
                col = 42;
                /* Put the stats (and percents) */
-               for (i = 0; i < 6; i++)
+               for (i = 0; i < A_MAX; i++)
                {
                        /* Race/Class bonus */
                        j = rp_ptr->r_adj[i] + cp_ptr->c_adj[i] + ap_ptr->a_adj[i];
@@ -3025,7 +3022,7 @@ static bool get_stat_limits(void)
        put_str(_("         基本値  種族 職業 性格     合計値  最大値", "           Base   Rac  Cla  Per      Total  Maximum"), 13, 10);
 
        /* Output the maximum stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                /* Reset the "success" counter */
                stat_match[i] = 0;
@@ -3085,7 +3082,7 @@ static bool get_stat_limits(void)
                        {
                                c_put_str(TERM_WHITE, _("決定する", "Accept"), 21, 35);
                        }
-                       else if(os < 6)
+                       else if(os < A_MAX)
                        {
                                c_put_str(TERM_WHITE, cur, 14 + os, 10);
                        }
@@ -3144,7 +3141,7 @@ static bool get_stat_limits(void)
                        break;
                case '2':
                case 'j':
-                       if (cs < 6) cs++;
+                       if (cs < A_MAX) cs++;
                        break;
                case '4':
                case 'h':
@@ -3218,7 +3215,7 @@ static bool get_stat_limits(void)
                if(c == ESCAPE || ((c == ' ' || c == '\r' || c == '\n') && cs == 6))break;
        }
        
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                /* Save the minimum stat */
                stat_limit[i] = (s16b)cval[i];
@@ -4083,7 +4080,7 @@ static bool player_birth_aux(void)
                roff_to_buf(seikaku_jouhou[p_ptr->pseikaku], 74, temp, sizeof(temp));
                t = temp;
 
-               for (i = 0; i< 6; i++)
+               for (i = 0; i< A_MAX; i++)
                {
                        if(t[0] == 0)
                                break; 
@@ -4215,7 +4212,7 @@ static bool player_birth_aux(void)
 
 
                        /* Put the minimal stats */
-                       for (i = 0; i < 6; i++)
+                       for (i = 0; i < A_MAX; i++)
                        {
                                int j, m;
 
@@ -4252,7 +4249,7 @@ static bool player_birth_aux(void)
 
                                if (autoroller)
                                {
-                                       for (i = 0; i < 6; i++)
+                                       for (i = 0; i < A_MAX; i++)
                                        {
                                                stat_match[i] = 0;
                                        }
@@ -4262,7 +4259,7 @@ static bool player_birth_aux(void)
                        if (autoroller)
                        {
                                /* Check and count acceptable stats */
-                               for (i = 0; i < 6; i++)
+                               for (i = 0; i < A_MAX; i++)
                                {
                                        /* This stat is okay */
                                        if (p_ptr->stat_max[i] >= stat_limit[i])
@@ -4691,7 +4688,7 @@ void dump_yourself(FILE *fff)
        fprintf(fff, _("性格: %s\n", "Pesonality: %s\n"), seikaku_info[p_ptr->pseikaku].title);
 
        t = temp;
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                if(t[0] == 0)
                        break; 
@@ -4705,7 +4702,7 @@ void dump_yourself(FILE *fff)
                fprintf(fff, _("魔法: %s\n", "Realm: %s\n"), realm_names[p_ptr->realm1]);
 
                t = temp;
-               for (i = 0; i < 6; i++)
+               for (i = 0; i < A_MAX; i++)
                {
                        if(t[0] == 0)
                                break; 
@@ -4720,7 +4717,7 @@ void dump_yourself(FILE *fff)
                fprintf(fff, _("魔法: %s\n", "Realm: %s\n"), realm_names[p_ptr->realm2]);
 
                t = temp;
-               for (i = 0; i < 6; i++)
+               for (i = 0; i < A_MAX; i++)
                {
                        if(t[0] == 0)
                                break; 

diff --git a/src/cmd-activate.c b/src/cmd-activate.c
index add8bca..5be685f 100644 (file)
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -1839,7 +1839,7 @@ void get_bloody_moon_flags(object_type *o_ptr)
        for (i = 0; i < 2; i++)
        {
                int tmp = randint0(11);
-               if (tmp < 6) add_flag(o_ptr->art_flags, TR_STR + tmp);
+               if (tmp < A_MAX) add_flag(o_ptr->art_flags, TR_STR + tmp);
                else add_flag(o_ptr->art_flags, TR_STEALTH + tmp - 6);
        }
 }

diff --git a/src/cmd4.c b/src/cmd4.c
index 24bfbb2..67d28bd 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -7672,7 +7672,7 @@ static void do_cmd_knowledge_stat(void)
                else fprintf(fff, "Your current Life Rating is ???.\n\n");
                fprintf(fff, "Limits of maximum stats\n\n");
 #endif
-               for (v_nr = 0; v_nr < 6; v_nr++)
+               for (v_nr = 0; v_nr < A_MAX; v_nr++)
                {
                        if ((p_ptr->knowledge & KNOW_STAT) || p_ptr->stat_max[v_nr] == p_ptr->stat_max_max[v_nr]) fprintf(fff, "%s 18/%d\n", stat_names[v_nr], p_ptr->stat_max_max[v_nr]-18);
                        else fprintf(fff, "%s ???\n", stat_names[v_nr]);

diff --git a/src/effects.c b/src/effects.c
index 4fcec76..8f7a04d 100644 (file)
--- a/src/effects.c
+++ b/src/effects.c
@@ -3936,7 +3936,7 @@ void do_poly_self(void)
                        /* Harmful deformity */
                        power -= 15;
 
-                       while (tmp < 6)
+                       while (tmp < A_MAX)
                        {
                                if (one_in_(2))
                                {
@@ -3987,7 +3987,7 @@ void do_poly_self(void)
                power -= 20;
                msg_format(_("%sの構成が変化した！", "Your internal organs are rearranged!"), p_ptr->prace == RACE_ANDROID ? "機械" : "内臓");
 
-               while (tmp < 6)
+               while (tmp < A_MAX)
                {
                        (void)dec_stat(tmp, randint1(6) + 6, one_in_(3));
                        tmp++;

diff --git a/src/files.c b/src/files.c
index 87f099b..efcf568 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -3533,7 +3533,7 @@ static void display_player_stat_info(void)
        c_put_str(TERM_YELLOW, _("現在", "Current"), row, stat_col+35);
 
        /* Display the stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                int r_adj;
 
@@ -3630,7 +3630,7 @@ static void display_player_stat_info(void)
                object_flags_known(o_ptr, flgs);
 
                /* Initialize color based of sign of pval. */
-               for (stat = 0; stat < 6; stat++)
+               for (stat = 0; stat < A_MAX; stat++)
                {
                        /* Default */
                        a = TERM_SLATE;
@@ -3689,7 +3689,7 @@ static void display_player_stat_info(void)
        player_flags(flgs);
 
        /* Check stats */
-       for (stat = 0; stat < 6; stat++)
+       for (stat = 0; stat < A_MAX; stat++)
        {
                /* Default */
                a = TERM_SLATE;
@@ -3852,7 +3852,7 @@ void display_player(int mode)
 
 
                /* Display the stats */
-               for (i = 0; i < 6; i++)
+               for (i = 0; i < A_MAX; i++)
                {
                        /* Special treatment of "injured" stats */
                        if (p_ptr->stat_cur[i] < p_ptr->stat_max[i])
@@ -4807,7 +4807,7 @@ static void dump_aux_virtues(FILE *fff)
                else fprintf(fff, "Your current Life Rating is ???.\n\n");
                fprintf(fff, "Limits of maximum stats\n");
 #endif
-               for (v_nr = 0; v_nr < 6; v_nr++)
+               for (v_nr = 0; v_nr < A_MAX; v_nr++)
                {
                        if ((p_ptr->knowledge & KNOW_STAT) || p_ptr->stat_max[v_nr] == p_ptr->stat_max_max[v_nr]) fprintf(fff, "%s 18/%d\n", stat_names[v_nr], p_ptr->stat_max_max[v_nr]-18);
                        else fprintf(fff, "%s ???\n", stat_names[v_nr]);

diff --git a/src/floor-save.c b/src/floor-save.c
index f2128fc..a28e326 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -530,7 +530,7 @@ static void place_pet(void)
                        int j;
                        POSITION d;
 
-                       for (d = 1; d < 6; d++)
+                       for (d = 1; d < A_MAX; d++)
                        {
                                for (j = 1000; j > 0; j--)
                                {

diff --git a/src/init1.c b/src/init1.c
index e643c20..98720fb 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -3000,7 +3000,7 @@ errr parse_r_info(char *buf, header *head)
        {
                int id, ds, dd;
                /* Find the next empty blow slot (if any) */
-               for (i = 0; i < 6; i++) if (r_ptr->reinforce_id[i] == 0) break;
+               for (i = 0; i < A_MAX; i++) if (r_ptr->reinforce_id[i] == 0) break;
 
                /* Oops, no more slots */
                if (i == 6) return (1);

diff --git a/src/init2.c b/src/init2.c
index f64375e..7669de9 100644 (file)
--- a/src/init2.c
+++ b/src/init2.c
@@ -1875,7 +1875,7 @@ static errr init_other(void)
         *  Window 1 : Display messages
         *  Window 2 : Display inven/equip
         */
-       window_flag[1] = 1L << 6;
+       window_flag[1] = 1L << A_MAX;
        window_flag[2] = 1L << 0;
 
 

diff --git a/src/load.c b/src/load.c
index f4c6595..12db4de 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -1682,8 +1682,8 @@ static void load_quick_start(void)
        rd_s16b(&previous_char.sc);
        rd_s32b(&previous_char.au);
 
-       for (i = 0; i < 6; i++) rd_s16b(&previous_char.stat_max[i]);
-       for (i = 0; i < 6; i++) rd_s16b(&previous_char.stat_max_max[i]);
+       for (i = 0; i < A_MAX; i++) rd_s16b(&previous_char.stat_max[i]);
+       for (i = 0; i < A_MAX; i++) rd_s16b(&previous_char.stat_max_max[i]);
 
        for (i = 0; i < PY_MAX_LEVEL; i++)
        {
@@ -1770,9 +1770,9 @@ static void rd_extra(void)
        rd_s16b(&p_ptr->wt);
 
        /* Read the stat info */
-       for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_max[i]);
-       for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_max_max[i]);
-       for (i = 0; i < 6; i++) rd_s16b(&p_ptr->stat_cur[i]);
+       for (i = 0; i < A_MAX; i++) rd_s16b(&p_ptr->stat_max[i]);
+       for (i = 0; i < A_MAX; i++) rd_s16b(&p_ptr->stat_max_max[i]);
+       for (i = 0; i < A_MAX; i++) rd_s16b(&p_ptr->stat_cur[i]);
 
        strip_bytes(24);
        rd_s32b(&p_ptr->au);

diff --git a/src/mane.c b/src/mane.c
index dd68f3f..6db37e0 100644 (file)
--- a/src/mane.c
+++ b/src/mane.c
@@ -811,7 +811,7 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("モンスターを召喚した！", "You summon monsters!"));
-               for (k = 0;k < 6; k++)
+               for (k = 0;k < A_MAX; k++)
                        summon_specific(-1, target_row, target_col, plev, 0, (mode | u_mode), '\0');
                break;
        }
@@ -820,7 +820,7 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("アリを召喚した。", "You summon ants."));
-               for (k = 0;k < 6; k++)
+               for (k = 0;k < A_MAX; k++)
                        summon_specific(-1, target_row, target_col, plev, SUMMON_ANT, mode, '\0');
                break;
        }
@@ -829,7 +829,7 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("蜘蛛を召喚した。", "You summon spiders."));
-               for (k = 0;k < 6; k++)
+               for (k = 0;k < A_MAX; k++)
                        summon_specific(-1, target_row, target_col, plev, SUMMON_SPIDER, mode, '\0');
                break;
        }
@@ -892,7 +892,7 @@ static bool use_mane(int spell)
                int k;
                if (!target_set(TARGET_KILL)) return FALSE;
                msg_print(_("強力なアンデッドを召喚した！", "You summon greater undead!"));
-               for (k = 0;k < 6; k++)
+               for (k = 0;k < A_MAX; k++)
                        summon_specific(-1, target_row, target_col, plev, SUMMON_HI_UNDEAD, (mode | u_mode), '\0');
                break;
        }

diff --git a/src/melee1.c b/src/melee1.c
index f985d85..163e3de 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -2690,7 +2690,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                        {
                                                                msg_print(_("あなたは以前ほど力強くなくなってしまった...。", "You're not as powerful as you used to be..."));
 
-                                                               for (k = 0; k < 6; k++)
+                                                               for (k = 0; k < A_MAX; k++)
                                                                {
                                                                        p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 7) / 8;
                                                                        if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;

diff --git a/src/monster-process.c b/src/monster-process.c
index d676071..7713d7b 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -2374,7 +2374,7 @@ void process_monster(MONSTER_IDX m_idx)
                                        DEPTH rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
                                        BIT_FLAGS p_mode = is_pet(m_ptr) ? PM_FORCE_PET : 0L;
 
-                                       for (k = 0; k < 6; k++)
+                                       for (k = 0; k < A_MAX; k++)
                                        {
                                                if (summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_MOLD, (PM_ALLOW_GROUP | p_mode), '\0'))
                                                {

diff --git a/src/monster1.c b/src/monster1.c
index 6c3661f..d56330e 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -258,7 +258,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
        flags7 = (r_ptr->flags7 & r_ptr->flags7);
        flagsr = (r_ptr->flagsr & r_ptr->r_flagsr);
 
-       for(n = 0; n < 6; n++)
+       for(n = 0; n < A_MAX; n++)
        {
                if(r_ptr->reinforce_id[n] > 0) reinforce = TRUE;
        }
@@ -738,7 +738,7 @@ static void roff_aux(MONRACE_IDX r_idx, BIT_FLAGS mode)
 #ifndef JP
                        hooked_roff(" contain ");
 #endif                 
-                       for(n = 0; n < 6; n++)
+                       for(n = 0; n < A_MAX; n++)
                        {
                                if(r_ptr->reinforce_id[n] && r_ptr->reinforce_dd[n] && r_ptr->reinforce_ds[n])
                                {

diff --git a/src/monster2.c b/src/monster2.c
index 7b59e09..3b49643 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -3581,7 +3581,7 @@ bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_id
        place_monster_m_idx = hack_m_idx_ii;
 
        /* Reinforcement */
-       for(i = 0; i < 6; i++)
+       for(i = 0; i < A_MAX; i++)
        {
                if(!r_ptr->reinforce_id[i]) break;
                n = damroll(r_ptr->reinforce_dd[i], r_ptr->reinforce_ds[i]);

diff --git a/src/racial.c b/src/racial.c
index e8b699b..0dd4a81 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -745,7 +745,7 @@ static bool cmd_racial_power_aux(s32b command)
                        int i;
                        cave_type *c_ptr;
 
-                       for (i = 0; i < 6; i++)
+                       for (i = 0; i < A_MAX; i++)
                        {
                                dir = randint0(8);
                                y = p_ptr->y + ddy_ddd[dir];

diff --git a/src/realm-hex.c b/src/realm-hex.c
index 9fd9e8f..0fc16eb 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -873,7 +873,7 @@ cptr do_hex_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                                flag = TRUE;
                        }
-                       for (i = A_STR; i < 6; i++)
+                       for (i = A_STR; i < A_MAX; i++)
                        {
                                if (p_ptr->stat_cur[i] < p_ptr->stat_max[i])
                                {

diff --git a/src/realm-song.c b/src/realm-song.c
index a479e92..3ff0c3f 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -331,7 +331,7 @@ cptr do_music_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                        detect_monsters_invis(rad);
                                        detect_monsters_normal(rad);
 
-                                       if (plev > 19 && count < 6)
+                                       if (plev > 19 && count < A_MAX)
                                                SINGING_COUNT(p_ptr) = count + 1;
                                }
                                detect_traps(rad, TRUE);

diff --git a/src/save.c b/src/save.c
index 35d5dac..67ef9fe 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -568,8 +568,8 @@ static void save_quick_start(void)
        wr_s16b(previous_char.sc);
        wr_s32b(previous_char.au);
 
-       for (i = 0; i < 6; i++) wr_s16b(previous_char.stat_max[i]);
-       for (i = 0; i < 6; i++) wr_s16b(previous_char.stat_max_max[i]);
+       for (i = 0; i < A_MAX; i++) wr_s16b(previous_char.stat_max[i]);
+       for (i = 0; i < A_MAX; i++) wr_s16b(previous_char.stat_max_max[i]);
 
        for (i = 0; i < PY_MAX_LEVEL; i++) wr_s16b((s16b)previous_char.player_hp[i]);
 
@@ -626,9 +626,9 @@ static void wr_extra(void)
        wr_s16b(p_ptr->wt);
 
        /* Dump the stats (maximum and current) */
-       for (i = 0; i < 6; ++i) wr_s16b(p_ptr->stat_max[i]);
-       for (i = 0; i < 6; ++i) wr_s16b(p_ptr->stat_max_max[i]);
-       for (i = 0; i < 6; ++i) wr_s16b(p_ptr->stat_cur[i]);
+       for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_max[i]);
+       for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_max_max[i]);
+       for (i = 0; i < A_MAX; ++i) wr_s16b(p_ptr->stat_cur[i]);
 
        /* Ignore the transient stats */
        for (i = 0; i < 12; ++i) wr_s16b(0);

diff --git a/src/selfinfo.c b/src/selfinfo.c
index 302f101..43d24c3 100644 (file)
--- a/src/selfinfo.c
+++ b/src/selfinfo.c
@@ -95,7 +95,7 @@ void self_knowledge(void)
 \r
        info[i++] = _("能力の最大値", "Limits of maximum stats");\r
 \r
-       for (v_nr = 0; v_nr < 6; v_nr++)\r
+       for (v_nr = 0; v_nr < A_MAX; v_nr++)\r
        {\r
                char stat_desc[80];\r
 \r

diff --git a/src/spells1.c b/src/spells1.c
index 800de00..3a5e7fe 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -4978,7 +4978,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                int i = 0;
                                if (one_in_(13))
                                {
-                                       while (i < 6)
+                                       while (i < A_MAX)
                                        {
                                                do
                                                {
@@ -5709,7 +5709,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
                                                msg_print(_("あなたは以前ほど力強くなくなってしまった...。", 
                                                                        "You're not as powerful as you used to be..."));
 
-                                               for (k = 0; k < 6; k++)
+                                               for (k = 0; k < A_MAX; k++)
                                                {
                                                        p_ptr->stat_cur[k] = (p_ptr->stat_cur[k] * 7) / 8;
                                                        if (p_ptr->stat_cur[k] < 3) p_ptr->stat_cur[k] = 3;

diff --git a/src/spells2.c b/src/spells2.c
index 414aed0..0b7a86e 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3496,7 +3496,7 @@ bool activate_ty_curse(bool stop_ty, int *count)
                        }
                        if (!one_in_(6)) break;
                default:
-                       while (i < 6)
+                       while (i < A_MAX)
                        {
                                do
                                {

diff --git a/src/util.c b/src/util.c
index 215c44b..c93b9c1 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -2506,7 +2506,7 @@ void message_add(cptr str)
                if (*t)
                {
                        /* Message is too small */
-                       if (strlen(buf) < 6) break;
+                       if (strlen(buf) < A_MAX) break;
 
                        /* Drop the space */
                        *(t - 1) = '\0';

diff --git a/src/wizard2.c b/src/wizard2.c
index df7f437..a8b6a2e 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -379,7 +379,7 @@ static void do_cmd_wiz_change_aux(void)
 
 
        /* Query the stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                /* Prompt */
                sprintf(ppp, "%s (3-%d): ", stat_names[i], p_ptr->stat_max_max[i]);
@@ -1211,7 +1211,7 @@ static void do_cmd_wiz_blue_mage(void)
        int j = 0;
        BIT_FLAGS f4 = 0L, f5 = 0L, f6 = 0L;
 
-       for (j = 1; j < 6; j++)
+       for (j = 1; j < A_MAX; j++)
        {
                set_rf_masks(&f4, &f5, &f6, j);
 

diff --git a/src/xtra1.c b/src/xtra1.c
index f817f09..242b1f3 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -1539,7 +1539,7 @@ static void prt_frame_basic(void)
        prt_exp();
 
        /* All Stats */
-       for (i = 0; i < 6; i++) prt_stat(i);
+       for (i = 0; i < A_MAX; i++) prt_stat(i);
 
        /* Armor */
        prt_ac();
@@ -3126,7 +3126,7 @@ void calc_bonuses(void)
        extra_blows[0] = extra_blows[1] = 0;
 
        /* Clear the stat modifiers */
-       for (i = 0; i < 6; i++) p_ptr->stat_add[i] = 0;
+       for (i = 0; i < A_MAX; i++) p_ptr->stat_add[i] = 0;
 
 
        /* Clear the Displayed/Real armor class */
@@ -3791,7 +3791,7 @@ void calc_bonuses(void)
 
        /* Hack -- apply racial/class stat maxes */
        /* Apply the racial modifiers */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                /* Modify the stats for "race" */
                p_ptr->stat_add[i] += (tmp_rp_ptr->r_adj[i] + cp_ptr->c_adj[i] + ap_ptr->a_adj[i]);
@@ -4352,7 +4352,7 @@ void calc_bonuses(void)
 
        if (p_ptr->special_defense & KATA_KOUKIJIN)
        {
-               for (i = 0; i < 6; i++)
+               for (i = 0; i < A_MAX; i++)
                        p_ptr->stat_add[i] += 5;
                p_ptr->to_a -= 50;
                p_ptr->dis_to_a -= 50;
@@ -4412,7 +4412,7 @@ void calc_bonuses(void)
        }
 
        /* Calculate stats */
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < A_MAX; i++)
        {
                int top, use, ind;
 

diff --git a/src/xtra2.c b/src/xtra2.c
index 846c292..1a9c191 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -139,7 +139,7 @@ void check_experience(void)
                                                choice = inkey();
                                                if ((choice >= 'a') && (choice <= 'f')) break;
                                        }
-                                       for(n = 0; n < 6; n++)
+                                       for(n = 0; n < A_MAX; n++)
                                                if (n != choice - 'a')
                                                        prt("",n+2,14);
                                        if (get_check(_("よろしいですか？", "Are you sure? "))) break;
@@ -4414,7 +4414,7 @@ void gain_level_reward(int chosen_reward)
                        msg_print(_("「汝、謙虚たることを学ぶべし！」", "'Thou needst a lesson in humility, mortal!'"));
                        msg_print(_("あなたは以前より弱くなった！", "You feel less powerful!"));
 
-                       for (dummy = 0; dummy < 6; dummy++)
+                       for (dummy = 0; dummy < A_MAX; dummy++)
                        {
                                (void)dec_stat(dummy, 10 + randint1(15), TRUE);
                        }
@@ -4435,7 +4435,7 @@ void gain_level_reward(int chosen_reward)
 
                        msg_print(_("「我がささやかなる賜物を受けとるがよい！」", "'Receive this modest gift from me!'"));
 
-                       for (dummy = 0; dummy < 6; dummy++)
+                       for (dummy = 0; dummy < A_MAX; dummy++)
                        {
                                (void)do_inc_stat(dummy);
                        }
@@ -4526,7 +4526,7 @@ void gain_level_reward(int chosen_reward)
                                        }
                                        break;
                                default:
-                                       for (dummy = 0; dummy < 6; dummy++)
+                                       for (dummy = 0; dummy < A_MAX; dummy++)
                                        {
                                                (void)dec_stat(dummy, 10 + randint1(15), TRUE);
                                        }
@@ -4541,7 +4541,7 @@ void gain_level_reward(int chosen_reward)
                        msg_print(_("「死ぬがよい、下僕よ！」", "'Die, mortal!'"));
 
                        take_hit(DAMAGE_LOSELIFE, p_ptr->lev * 4, wrath_reason, -1);
-                       for (dummy = 0; dummy < 6; dummy++)
+                       for (dummy = 0; dummy < A_MAX; dummy++)
                        {
                                (void)dec_stat(dummy, 10 + randint1(15), FALSE);
                        }