Vanillaにならって、キャラクターの状態を表わすグローバル変数の多くを

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

diff --git a/src/xtra1.c b/src/xtra1.c
index a9fa07d..8e27d2c 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -652,7 +652,7 @@ static void prt_title(void)
        char str[14];
 
        /* Wizard */
-       if (wizard)
+       if (p_ptr->wizard)
        {
 #ifdef JP
                 /* ±ÑÆüÀÚ¤êÂؤ¨µ¡Ç½ ¾Î¹æ */
@@ -664,7 +664,7 @@ static void prt_title(void)
        }
 
        /* Winner */
-       else if (total_winner || (p_ptr->lev > PY_MAX_LEVEL))
+       else if (p_ptr->total_winner || (p_ptr->lev > PY_MAX_LEVEL))
        {
                if ((p_ptr->arena_number > MAX_ARENA_MONS+2) && (p_ptr->arena_number < 99))
                {
@@ -1330,7 +1330,7 @@ static void prt_mane(void)
 
        if (p_ptr->pclass == CLASS_IMITATOR)
        {
-               if (mane_num)
+               if (p_ptr->mane_num)
                {
                        byte attr;
                        if (new_mane) attr = TERM_L_RED;
@@ -2123,8 +2123,8 @@ static void calc_spells(void)
        {
                /* Count known spells */
                if ((j < 32) ?
-                    (spell_forgotten1 & (1L << j)) :
-                    (spell_forgotten2 & (1L << (j - 32))))
+                    (p_ptr->spell_forgotten1 & (1L << j)) :
+                    (p_ptr->spell_forgotten2 & (1L << (j - 32))))
                {
                        num_boukyaku++;
                 }
@@ -2137,10 +2137,10 @@ static void calc_spells(void)
        for (i = 63; i >= 0; i--)
        {
                /* Efficiency -- all done */
-               if (!spell_learned1 && !spell_learned2) break;
+               if (!p_ptr->spell_learned1 && !p_ptr->spell_learned2) break;
 
                /* Access the spell */
-               j = spell_order[i];
+               j = p_ptr->spell_order[i];
 
                /* Skip non-spells */
                if (j >= 99) continue;
@@ -2164,30 +2164,30 @@ static void calc_spells(void)
 
                /* Is it known? */
                if ((j < 32) ?
-                   (spell_learned1 & (1L << j)) :
-                   (spell_learned2 & (1L << (j - 32))))
+                   (p_ptr->spell_learned1 & (1L << j)) :
+                   (p_ptr->spell_learned2 & (1L << (j - 32))))
                {
                        /* Mark as forgotten */
                        if (j < 32)
                        {
-                               spell_forgotten1 |= (1L << j);
+                               p_ptr->spell_forgotten1 |= (1L << j);
                                which = use_realm1;
                        }
                        else
                        {
-                               spell_forgotten2 |= (1L << (j - 32));
+                               p_ptr->spell_forgotten2 |= (1L << (j - 32));
                                which = use_realm2;
                        }
 
                        /* No longer known */
                        if (j < 32)
                        {
-                               spell_learned1 &= ~(1L << j);
+                               p_ptr->spell_learned1 &= ~(1L << j);
                                which = use_realm1;
                        }
                        else
                        {
-                               spell_learned2 &= ~(1L << (j - 32));
+                               p_ptr->spell_learned2 &= ~(1L << (j - 32));
                                which = use_realm2;
                        }
 
@@ -2214,40 +2214,40 @@ static void calc_spells(void)
                if (p_ptr->new_spells >= 0) break;
 
                /* Efficiency -- all done */
-               if (!spell_learned1 && !spell_learned2) break;
+               if (!p_ptr->spell_learned1 && !p_ptr->spell_learned2) break;
 
                /* Get the (i+1)th spell learned */
-               j = spell_order[i];
+               j = p_ptr->spell_order[i];
 
                /* Skip unknown spells */
                if (j >= 99) continue;
 
                /* Forget it (if learned) */
                if ((j < 32) ?
-                   (spell_learned1 & (1L << j)) :
-                   (spell_learned2 & (1L << (j - 32))))
+                   (p_ptr->spell_learned1 & (1L << j)) :
+                   (p_ptr->spell_learned2 & (1L << (j - 32))))
                {
                        /* Mark as forgotten */
                        if (j < 32)
                        {
-                               spell_forgotten1 |= (1L << j);
+                               p_ptr->spell_forgotten1 |= (1L << j);
                                which = use_realm1;
                        }
                        else
                        {
-                               spell_forgotten2 |= (1L << (j - 32));
+                               p_ptr->spell_forgotten2 |= (1L << (j - 32));
                                which = use_realm2;
                        }
 
                        /* No longer known */
                        if (j < 32)
                        {
-                               spell_learned1 &= ~(1L << j);
+                               p_ptr->spell_learned1 &= ~(1L << j);
                                which = use_realm1;
                        }
                        else
                        {
-                               spell_learned2 &= ~(1L << (j - 32));
+                               p_ptr->spell_learned2 &= ~(1L << (j - 32));
                                which = use_realm2;
                        }
 
@@ -2274,10 +2274,10 @@ static void calc_spells(void)
                if (p_ptr->new_spells <= 0) break;
 
                /* Efficiency -- all done */
-               if (!spell_forgotten1 && !spell_forgotten2) break;
+               if (!p_ptr->spell_forgotten1 && !p_ptr->spell_forgotten2) break;
 
                /* Get the next spell we learned */
-               j = spell_order[i];
+               j = p_ptr->spell_order[i];
 
                /* Skip unknown spells */
                if (j >= 99) break;
@@ -2300,30 +2300,30 @@ static void calc_spells(void)
 
                /* First set of spells */
                if ((j < 32) ?
-                   (spell_forgotten1 & (1L << j)) :
-                   (spell_forgotten2 & (1L << (j - 32))))
+                   (p_ptr->spell_forgotten1 & (1L << j)) :
+                   (p_ptr->spell_forgotten2 & (1L << (j - 32))))
                {
                        /* No longer forgotten */
                        if (j < 32)
                        {
-                               spell_forgotten1 &= ~(1L << j);
+                               p_ptr->spell_forgotten1 &= ~(1L << j);
                                which = use_realm1;
                        }
                        else
                        {
-                               spell_forgotten2 &= ~(1L << (j - 32));
+                               p_ptr->spell_forgotten2 &= ~(1L << (j - 32));
                                which = use_realm2;
                        }
 
                        /* Known once more */
                        if (j < 32)
                        {
-                               spell_learned1 |= (1L << j);
+                               p_ptr->spell_learned1 |= (1L << j);
                                which = use_realm1;
                        }
                        else
                        {
-                               spell_learned2 |= (1L << (j - 32));
+                               p_ptr->spell_learned2 |= (1L << (j - 32));
                                which = use_realm2;
                        }
 
@@ -2356,7 +2356,7 @@ static void calc_spells(void)
                        if (s_ptr->slevel > p_ptr->lev) continue;
 
                        /* Skip spells we already know */
-                       if (spell_learned1 & (1L << j))
+                       if (p_ptr->spell_learned1 & (1L << j))
                        {
                                continue;
                        }
@@ -2749,7 +2749,7 @@ static void calc_hitpoints(void)
        bonus = ((int)(adj_con_mhp[p_ptr->stat_ind[A_CON]]) - 128) * p_ptr->lev / 4;
 
        /* Calculate hitpoints */
-       mhp = player_hp[p_ptr->lev - 1];
+       mhp = p_ptr->player_hp[p_ptr->lev - 1];
 
        if (p_ptr->mimic_form)
        {
@@ -4437,15 +4437,15 @@ void calc_bonuses(void)
 
        if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM))
        {
-               p_ptr->to_h[0] += (skill_exp[GINOU_SUDE]-4000)/200;
-               p_ptr->dis_to_h[0] += (skill_exp[GINOU_SUDE]-4000)/200;
+               p_ptr->to_h[0] += (p_ptr->skill_exp[GINOU_SUDE]-4000)/200;
+               p_ptr->dis_to_h[0] += (p_ptr->skill_exp[GINOU_SUDE]-4000)/200;
        }
 
        if (buki_motteruka(INVEN_RARM) && buki_motteruka(INVEN_LARM))
        {
                int penalty1, penalty2;
-               penalty1 = ((100-skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_RARM].weight)/8);
-               penalty2 = ((100-skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_LARM].weight)/8);
+               penalty1 = ((100-p_ptr->skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_RARM].weight)/8);
+               penalty2 = ((100-p_ptr->skill_exp[GINOU_NITOURYU]/160) - (130-inventory[INVEN_LARM].weight)/8);
                if ((inventory[INVEN_RARM].name1 == ART_QUICKTHORN) && (inventory[INVEN_LARM].name1 == ART_TINYTHORN))
                {
                        penalty1 = penalty1 / 2 - 5;
@@ -4497,7 +4497,7 @@ void calc_bonuses(void)
                int speed = m_list[p_ptr->riding].mspeed;
                if (m_list[p_ptr->riding].mspeed > 110)
                {
-                       p_ptr->pspeed = 110 + (s16b)((speed-110)*(skill_exp[GINOU_RIDING]*3 + p_ptr->lev*160L - 10000L)/(22000L));
+                       p_ptr->pspeed = 110 + (s16b)((speed-110)*(p_ptr->skill_exp[GINOU_RIDING]*3 + p_ptr->lev*160L - 10000L)/(22000L));
                        if (p_ptr->pspeed < 110) p_ptr->pspeed = 110;
                }
                else
@@ -4509,7 +4509,7 @@ void calc_bonuses(void)
                if (r_info[m_list[p_ptr->riding].r_idx].flags7 & RF7_CAN_FLY) p_ptr->ffall = TRUE;
                if (r_info[m_list[p_ptr->riding].r_idx].flags7 & (RF7_CAN_SWIM | RF7_AQUATIC)) p_ptr->can_swim = TRUE;
 
-               if (skill_exp[GINOU_RIDING] < 2000) j += (p_ptr->wt*3*(2000 - skill_exp[GINOU_RIDING]))/2000;
+               if (p_ptr->skill_exp[GINOU_RIDING] < 2000) j += (p_ptr->wt*3*(2000 - p_ptr->skill_exp[GINOU_RIDING]))/2000;
 
                i = 3000 + r_info[m_list[p_ptr->riding].r_idx].level * 50;
        }
@@ -4899,7 +4899,7 @@ void calc_bonuses(void)
                                }
                                else
                                {
-                                       penalty = r_info[m_list[p_ptr->riding].r_idx].level - skill_exp[GINOU_RIDING] / 80;
+                                       penalty = r_info[m_list[p_ptr->riding].r_idx].level - p_ptr->skill_exp[GINOU_RIDING] / 80;
                                        penalty += 30;
                                        if (penalty < 30) penalty = 30;
                                }
@@ -4925,7 +4925,7 @@ void calc_bonuses(void)
                }
                else
                {
-                       penalty = r_info[m_list[p_ptr->riding].r_idx].level - skill_exp[GINOU_RIDING] / 80;
+                       penalty = r_info[m_list[p_ptr->riding].r_idx].level - p_ptr->skill_exp[GINOU_RIDING] / 80;
                        penalty += 30;
                        if (penalty < 30) penalty = 30;
                }
@@ -5031,8 +5031,8 @@ void calc_bonuses(void)
                        int tval = inventory[INVEN_RARM+i].tval - TV_BOW;
                        int sval = inventory[INVEN_RARM+i].sval;
 
-                       p_ptr->to_h[i] += (weapon_exp[tval][sval]-4000)/200;
-                       p_ptr->dis_to_h[i] += (weapon_exp[tval][sval]-4000)/200;
+                       p_ptr->to_h[i] += (p_ptr->weapon_exp[tval][sval]-4000)/200;
+                       p_ptr->dis_to_h[i] += (p_ptr->weapon_exp[tval][sval]-4000)/200;
                        if ((p_ptr->pclass == CLASS_MONK) && !(s_info[CLASS_MONK].w_max[tval][sval]))
                        {
                                p_ptr->to_h[i] -= 40;