OSDN Git Service

[Refactor] #37353 型の置換。 / Type replacement.
[hengband/hengband.git] / src / spells1.c
index 166dcd1..800de00 100644 (file)
@@ -17,6 +17,8 @@
 #include "object-curse.h"
 #include "player-damage.h"
 #include "monsterrace-hook.h"
+#include "melee.h"
+#include "world.h"
 
 
 static int rakubadam_m; /*!< 振り落とされた際のダメージ量 */
@@ -1261,7 +1263,7 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
        BIT_FLAGS flgs[TR_FLAG_SIZE];
 
-       char o_name[MAX_NLEN];
+       GAME_TEXT o_name[MAX_NLEN];
 
        KIND_OBJECT_IDX k_idx = 0;
        bool is_potion = FALSE;
@@ -1685,7 +1687,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
        bool heal_leper = FALSE;
 
        /* Hold the monster name */
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
        char m_poss[10];
 
        PARAMETER_VALUE photo = 0;
@@ -4032,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);
                                                }
@@ -4860,7 +4861,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
 
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                {
-                       char m2_name[80];
+                       char m2_name[MAX_NLEN];
 
                        monster_desc(m2_name, m_ptr, MD_INDEF_VISIBLE);
                        do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_HEAL_LEPER, m2_name);
@@ -4900,11 +4901,9 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        if (((dam > 0) || get_angry) && !do_sleep)
                                anger_monster(m_ptr);
 
-                       /* Take note */
                        if ((fear || do_fear) && seen)
                        {
                                sound(SOUND_FLEE);
-
                                msg_format(_("%^sは恐怖して逃げ出した!", "%^s flees in terror!"), m_name);
                        }
 
@@ -4964,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:
@@ -5056,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);
        }
 
@@ -5112,7 +5109,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
        monster_type *m_ptr = NULL;
 
        /* Monster name (for attacks) */
-       char m_name[80];
+       GAME_TEXT m_name[MAX_NLEN];
 
        /* Monster name (for damage) */
        char killer[80];
@@ -5191,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!) */
@@ -6162,7 +6155,7 @@ static bool project_p(MONSTER_IDX who, cptr who_name, int r, POSITION y, POSITIO
        if ((p_ptr->tim_eyeeye || hex_spelling(HEX_EYE_FOR_EYE))
                && (get_damage > 0) && !p_ptr->is_dead && (who > 0))
        {
-               char m_name_self[80];
+               GAME_TEXT m_name_self[80];
 
                /* hisself */
                monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
@@ -6711,7 +6704,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
        bool jump = FALSE;
 
        /* Attacker's name (prepared before polymorph)*/
-       char who_name[80];
+       GAME_TEXT who_name[MAX_NLEN];
 
        /* Can the player see the source of this effect? */
        bool see_s_msg = TRUE;
@@ -6857,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);
@@ -6900,37 +6893,37 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                                        Term_xtra(TERM_XTRA_DELAY, msec);
                                }
                        }
-                       if(project_o(0,0,y,x,dam,GF_SEEKER))notice=TRUE;
-                       ifis_mirror_grid(&cave[y][x]))
+                       if (project_o(0, 0, y, x, dam, GF_SEEKER))notice = TRUE;
+                       if (is_mirror_grid(&cave[y][x]))
                        {
-                         /* The target of monsterspell becomes tha mirror(broken) */
-                               monster_target_y=(s16b)y;
-                               monster_target_x=(s16b)x;
+                               /* The target of monsterspell becomes tha mirror(broken) */
+                               monster_target_y = y;
+                               monster_target_x = x;
 
                                remove_mirror(y, x);
                                next_mirror(&oy, &ox, y, x);
 
-                               path_n = i+project_path(&(path_g[i+1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
-                               for(j = last_i; j <= i; j++)
+                               path_n = i + project_path(&(path_g[i + 1]), (project_length ? project_length : MAX_RANGE), y, x, oy, ox, flg);
+                               for (j = last_i; j <= i; j++)
                                {
                                        y = GRID_Y(path_g[j]);
                                        x = GRID_X(path_g[j]);
-                                       if(project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice=TRUE;
-                                       if(!who && (project_m_n==1) && !jump ){
-                                         if(cave[project_m_y][project_m_x].m_idx >0 ){
-                                               monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
+                                       if (project_m(0, 0, y, x, dam, GF_SEEKER, flg, TRUE)) notice = TRUE;
+                                       if (!who && (project_m_n == 1) && !jump) {
+                                               if (cave[project_m_y][project_m_x].m_idx > 0) {
+                                                       monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
 
-                                               if (m_ptr->ml)
-                                               {
-                                                 /* Hack -- auto-recall */
-                                                 if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
+                                                       if (m_ptr->ml)
+                                                       {
+                                                               /* Hack -- auto-recall */
+                                                               if (!p_ptr->image) monster_race_track(m_ptr->ap_r_idx);
 
-                                                 /* Hack - auto-track */
-                                                 health_track(cave[project_m_y][project_m_x].m_idx);
+                                                               /* Hack - auto-track */
+                                                               health_track(cave[project_m_y][project_m_x].m_idx);
+                                                       }
                                                }
-                                         }
                                        }
-                                       (void)project_f(0,0,y,x,dam,GF_SEEKER);
+                                       (void)project_f(0, 0, y, x, dam, GF_SEEKER);
                                }
                                last_i = i;
                        }
@@ -6940,10 +6933,10 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
                        POSITION py, px;
                        py = GRID_Y(path_g[i]);
                        px = GRID_X(path_g[i]);
-                       if(project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
+                       if (project_m(0, 0, py, px, dam, GF_SEEKER, flg, TRUE))
                                notice = TRUE;
-                       if(!who && (project_m_n==1) && !jump ){
-                               if(cave[project_m_y][project_m_x].m_idx > 0)
+                       if (!who && (project_m_n == 1) && !jump) {
+                               if (cave[project_m_y][project_m_x].m_idx > 0)
                                {
                                        monster_type *m_ptr = &m_list[cave[project_m_y][project_m_x].m_idx];
 
@@ -6996,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);
@@ -7139,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);
@@ -7302,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;
 
@@ -7356,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)
        {
@@ -7400,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))
@@ -7700,7 +7689,7 @@ bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT da
 
        if (p_ptr->riding)
        {
-               char m_name[80];
+               GAME_TEXT m_name[MAX_NLEN];
 
                monster_desc(m_name, &m_list[p_ptr->riding], 0);