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

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

diff --git a/src/spells1.c b/src/spells1.c
index d73a74d..3a5e7fe 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -18,6 +18,7 @@
 #include "player-damage.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
+#include "world.h"
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
@@ -4033,7 +4034,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                                /* Special message */
                                                if (see_s_msg)
                                                {
-                                                       /* Get the monster name */
                                                        monster_desc(killer, caster_ptr, 0);
                                                        msg_format(_("%^sは気分が良さそうだ。", "%^s appears healthier."), killer);
                                                }
@@ -4963,7 +4963,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                if (pet) mode |= PM_FORCE_PET;
                                else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
 
-                               count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode);
+                               count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev*2/3+randint1(p_ptr->lev/2) : dun_level), 0, mode, '\0');
                                if (!one_in_(6)) break;
                        }
                        case 23: case 24: case 25:
@@ -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
                                                {
@@ -5055,8 +5055,6 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                /* Mark the item as fully known */
                q_ptr->ident |= (IDENT_MENTAL);
-
-               /* Drop it in the dungeon */
                (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
        }
 
@@ -5190,12 +5188,8 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
 
        if (who > 0)
        {
-               /* Get the source monster */
                m_ptr = &m_list[who];
-               /* Extract the monster level */
                rlev = (((&r_info[m_ptr->r_idx])->level >= 1) ? (&r_info[m_ptr->r_idx])->level : 1);
-
-               /* Get the monster name */
                monster_desc(m_name, m_ptr, 0);
 
                /* Get the monster's real name (gotten before polymorph!) */
@@ -5715,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;
@@ -6856,8 +6850,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                {
                                        u16b p;
 
-                                       byte a;
-                                       char c;
+                                       TERM_COLOR a;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -6995,7 +6989,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                        u16b p;
 
                                        TERM_COLOR a;
-                                       char c;
+                                       SYMBOL_CODE c;
 
                                        /* Obtain the bolt pict */
                                        p = bolt_pict(oy, ox, y, x, typ);
@@ -7138,8 +7132,8 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                        {
                                u16b p;
 
-                               byte a;
-                               char c;
+                               TERM_COLOR a;
+                               SYMBOL_CODE c;
 
                                /* Obtain the bolt pict */
                                p = bolt_pict(oy, ox, y, x, typ);
@@ -7301,7 +7295,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                        u16b p;
 
                                        TERM_COLOR a;
-                                       char c;
+                                       SYMBOL_CODE c;
 
                                        drawn = TRUE;
 
@@ -7355,10 +7349,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                }
        }
 
-
-       /* Update stuff if needed */
-       if (p_ptr->update) handle_stuff();
-
+       update_creature(p_ptr);
 
        if (flg & PROJECT_KILL)
        {
@@ -7399,8 +7390,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                }
        }
 
-       /* Update stuff if needed */
-       if (p_ptr->update) handle_stuff();
+       update_creature(p_ptr);
 
        /* Check objects */
        if (flg & (PROJECT_ITEM))