#37287 #37353 (2.2.0.89) TERM_COLOR 型を定義し、型の置換を継続中。 / Define TERM_COLOR, ongoing...

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

diff --git a/src/mspells2.c b/src/mspells2.c
index c5871f6..f8c85f9 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -73,23 +73,23 @@ static bool direct_beam(int y1, int x1, int y2, int x2, monster_type *m_ptr)
  * @param is_friend TRUEならば、プレイヤーを巻き込む時にブレスの判定をFALSEにする。
  * @return ブレスを直接当てられるならばTRUEを返す
  */
-static bool breath_direct(int y1, int x1, int y2, int x2, int rad, int typ, bool is_friend)
+static bool breath_direct(POSITION y1, POSITION x1, POSITION y2, POSITION x2, POSITION rad, int typ, bool is_friend)
 {
        /* Must be the same as projectable() */
 
        int i;
 
        /* Initial grid */
-       int y = y1;
-       int x = x1;
+       POSITION y = y1;
+       POSITION x = x1;
 
        int grid_n = 0;
        u16b grid_g[512];
 
        int grids = 0;
        POSITION gx[1024], gy[1024];
-       byte gm[32];
-       int gm_rad = rad;
+       POSITION gm[32];
+       POSITION gm_rad = rad;
 
        bool hit2 = FALSE;
        bool hityou = FALSE;
@@ -255,11 +255,11 @@ static bool dispel_check_monster(MONSTER_IDX m_idx, IDX t_idx)
  */
 bool monst_spell_monst(MONSTER_IDX m_idx)
 {
-       int y = 0, x = 0;
+       POSITION y = 0, x = 0;
        int i, k;
-       IDX t_idx = 0;
+       MONSTER_IDX t_idx = 0;
        int thrown_spell;
-       int dam = 0;
+       HIT_POINT dam = 0;
        int start;
        int plus = 1;
 
@@ -354,7 +354,7 @@ bool monst_spell_monst(MONSTER_IDX m_idx)
                /* Scan thru all monsters */
                for (i = start; ((i < start + m_max) && (i > start - m_max)); i += plus)
                {
-                       int dummy = (i % m_max);
+                       MONSTER_IDX dummy = (i % m_max);
                        if (!dummy) continue;
 
                        t_idx = dummy;