m_ptr->flag2のフラグ名を MFLAG_* からMFLAG2_* に変更した。

次のように自動で処理したので、参考までに。
% for x in src/*.[ch]; do sed 's/MFLAG_\(KAGE\|NOPET\|NOGENO\|CHAMELEON\|NOFLOW\)/MFLAG2_\1/g' $x>$x.new; diff -u $x $x.new>$x.diff; done;
% cat src/*.diff|patch -p0

diff --git a/src/defines.h b/src/defines.h
index aa291af..c7078c5 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -2926,11 +2926,11 @@
 #define MFLAG_SHOW      0x40    /* Monster is recently memorized */
 #define MFLAG_MARK      0x80    /* Monster is currently memorized */
 
-#define MFLAG_KAGE      0x01    /* Monster is kage */
-#define MFLAG_NOPET     0x02    /* Cannot make monster pet */
-#define MFLAG_NOGENO    0x04    /* Cannot genocide */
-#define MFLAG_CHAMELEON 0x08    /* Monster is chameleon */
-#define MFLAG_NOFLOW    0x10    /* Monster is in no_flow_by_smell mode */
+#define MFLAG2_KAGE      0x01    /* Monster is kage */
+#define MFLAG2_NOPET     0x02    /* Cannot make monster pet */
+#define MFLAG2_NOGENO    0x04    /* Cannot genocide */
+#define MFLAG2_CHAMELEON 0x08    /* Monster is chameleon */
+#define MFLAG2_NOFLOW    0x10    /* Monster is in no_flow_by_smell mode */
 
 
 /*

diff --git a/src/load.c b/src/load.c
index 24e65de..95e2f73 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -725,7 +725,7 @@ static void rd_monster_old(monster_type *m_ptr)
                if (m_ptr->r_idx < 0)
                {
                        m_ptr->r_idx = (0-m_ptr->r_idx);
-                       m_ptr->mflag2 |= MFLAG_KAGE;
+                       m_ptr->mflag2 |= MFLAG2_KAGE;
                }
        }
        else
@@ -735,7 +735,7 @@ static void rd_monster_old(monster_type *m_ptr)
 
        if (z_older_than(11, 0, 12))
        {
-               if (m_ptr->mflag2 & MFLAG_KAGE)
+               if (m_ptr->mflag2 & MFLAG2_KAGE)
                        m_ptr->ap_r_idx = MON_KAGE;
        }
 

diff --git a/src/melee2.c b/src/melee2.c
index 40aeff7..92f79eb 100644 (file)
--- a/src/melee2.c
+++ b/src/melee2.c
@@ -963,7 +963,7 @@ static bool find_safety(int m_idx, int *yp, int *xp)
                        if (!cave_floor_grid(c_ptr)) continue;
 
                        /* Check for "availability" (if monsters can flow) */
-                       if (!(m_ptr->mflag2 & MFLAG_NOFLOW))
+                       if (!(m_ptr->mflag2 & MFLAG2_NOFLOW))
                        {
                                /* Ignore grids very far from the player */
                                if (c_ptr->dist == 0) continue;
@@ -1098,7 +1098,7 @@ static bool get_moves(int m_idx, int *mm)
        bool         done = FALSE;
        bool         will_run = mon_will_run(m_idx);
        cave_type       *c_ptr;
-       bool         no_flow = ((m_ptr->mflag2 & MFLAG_NOFLOW) && (cave[m_ptr->fy][m_ptr->fx].cost > 2));
+       bool         no_flow = ((m_ptr->mflag2 & MFLAG2_NOFLOW) && (cave[m_ptr->fy][m_ptr->fx].cost > 2));
        bool         can_pass_wall;
 
        /* Flow towards the player */
@@ -2291,7 +2291,7 @@ static void process_monster(int m_idx)
                }
        }
 
-       if ((m_ptr->mflag2 & MFLAG_CHAMELEON) && one_in_(13) && !m_ptr->csleep)
+       if ((m_ptr->mflag2 & MFLAG2_CHAMELEON) && one_in_(13) && !m_ptr->csleep)
        {
                choose_new_monster(m_idx, FALSE, 0);
                r_ptr = &r_info[m_ptr->r_idx];
@@ -3693,7 +3693,7 @@ msg_format("%^s
         *  Try to flow by smell.
         */
        if (p_ptr->no_flowed && i > 2 &&  m_ptr->target_y)
-               m_ptr->mflag2 &= ~MFLAG_NOFLOW;
+               m_ptr->mflag2 &= ~MFLAG2_NOFLOW;
 
        /* If we haven't done anything, try casting a spell again */
        if (!do_turn && !do_move && !m_ptr->monfear && !(p_ptr->riding == m_idx) && aware)
@@ -3912,7 +3912,7 @@ void process_monsters(void)
                /* Flow by smell is allowed */
                if (!p_ptr->no_flowed)
                {
-                       m_ptr->mflag2 &= ~MFLAG_NOFLOW;
+                       m_ptr->mflag2 &= ~MFLAG2_NOFLOW;
                }
 
                /* Assume no move */
@@ -3936,7 +3936,7 @@ void process_monsters(void)
 #if 0 /* (cave[py][px].when == cave[fy][fx].when) is always FALSE... */
                /* Hack -- Monsters can "smell" the player from far away */
                /* Note that most monsters have "aaf" of "20" or so */
-               else if (!(m_ptr->mflag2 & MFLAG_NOFLOW) &&
+               else if (!(m_ptr->mflag2 & MFLAG2_NOFLOW) &&
                        (cave_floor_bold(py, px) || (cave[py][px].feat == FEAT_TREES)) &&
                        (cave[py][px].when == cave[fy][fx].when) &&
                        (cave[fy][fx].dist < MONSTER_FLOW_DEPTH) &&
@@ -3988,7 +3988,7 @@ void process_monsters(void)
 
                /* Give up flow_by_smell when it might useless */
                if (p_ptr->no_flowed && one_in_(3))
-                       m_ptr->mflag2 |= MFLAG_NOFLOW;
+                       m_ptr->mflag2 |= MFLAG2_NOFLOW;
 
                /* Hack -- notice death or departure */
                if (!p_ptr->playing || p_ptr->is_dead) break;
@@ -4124,7 +4124,7 @@ void monster_gain_exp(int m_idx, int s_idx)
        if (m_idx == p_ptr->riding) new_exp = (new_exp + 1) / 2;
        if (!dun_level) new_exp /= 5;
        m_ptr->exp += new_exp;
-       if (m_ptr->mflag2 & MFLAG_CHAMELEON) return;
+       if (m_ptr->mflag2 & MFLAG2_CHAMELEON) return;
 
        if (m_ptr->exp >= r_ptr->next_exp)
        {

diff --git a/src/monster1.c b/src/monster1.c
index c491d07..f868287 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -3646,7 +3646,7 @@ bool are_enemies(monster_type *m_ptr, monster_type *n_ptr)
                         ((m_ptr->sub_align & SUB_ALIGN_GOOD) &&
                          (n_ptr->sub_align & SUB_ALIGN_EVIL)))
                {
-                       if (!(m_ptr->mflag2 & MFLAG_CHAMELEON) || !(n_ptr->mflag2 & MFLAG_CHAMELEON)) return TRUE;
+                       if (!(m_ptr->mflag2 & MFLAG2_CHAMELEON) || !(n_ptr->mflag2 & MFLAG2_CHAMELEON)) return TRUE;
                }
        }
 

diff --git a/src/monster2.c b/src/monster2.c
index e8dfed2..d9b6c1f 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -178,7 +178,7 @@ monster_race *real_r_ptr(monster_type *m_ptr)
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
 
        /* Extract real race */
-       if (m_ptr->mflag2 & MFLAG_CHAMELEON)
+       if (m_ptr->mflag2 & MFLAG2_CHAMELEON)
        {
                if (r_ptr->flags1 & RF1_UNIQUE)
                        return &r_info[MON_CHAMELEON_K];
@@ -1698,7 +1698,7 @@ if (!get_rnd_line("silly_j.txt", m_ptr->r_idx, silly_name))
                if ((r_ptr->flags1 & RF1_UNIQUE) && !(p_ptr->image && !(mode & 0x200)))
                {
                        /* Start with the name (thus nominative and objective) */
-                       if ((m_ptr->mflag2 & MFLAG_CHAMELEON) && !(mode & 0x100))
+                       if ((m_ptr->mflag2 & MFLAG2_CHAMELEON) && !(mode & 0x100))
                        {
 #ifdef JP
                                char *t;
@@ -1781,7 +1781,7 @@ if (!get_rnd_line("silly_j.txt", m_ptr->r_idx, silly_name))
 #endif
                }
 
-               if ((mode & 0x200) && (m_ptr->mflag2 & MFLAG_CHAMELEON))
+               if ((mode & 0x200) && (m_ptr->mflag2 & MFLAG2_CHAMELEON))
                {
                        if (r_ptr->flags1 & RF1_UNIQUE)
                        {
@@ -3171,7 +3171,7 @@ msg_print("
        {
                choose_new_monster(c_ptr->m_idx, TRUE, 0);
                r_ptr = &r_info[m_ptr->r_idx];
-               m_ptr->mflag2 |= MFLAG_CHAMELEON;
+               m_ptr->mflag2 |= MFLAG2_CHAMELEON;
                rating++;
 
                /* Hack - Set sub_align to neutral when the Chameleon Lord is generated as "GUARDIAN" */
@@ -3181,10 +3181,10 @@ msg_print("
        else if (is_kage)
        {
                m_ptr->ap_r_idx = MON_KAGE;
-               m_ptr->mflag2 |= MFLAG_KAGE;
+               m_ptr->mflag2 |= MFLAG2_KAGE;
        }
 
-       if (mode & PM_NO_PET) m_ptr->mflag2 |= MFLAG_NOPET;
+       if (mode & PM_NO_PET) m_ptr->mflag2 |= MFLAG2_NOPET;
 
        /* Not visible */
        m_ptr->ml = FALSE;
@@ -3784,7 +3784,7 @@ bool alloc_horde(int y, int x)
 
        m_idx = cave[y][x].m_idx;
 
-       if (m_list[m_idx].mflag2 & MFLAG_CHAMELEON) r_ptr = &r_info[m_list[m_idx].r_idx];
+       if (m_list[m_idx].mflag2 & MFLAG2_CHAMELEON) r_ptr = &r_info[m_list[m_idx].r_idx];
        summon_kin_type = r_ptr->d_char;
 
        for (attempts = randint1(10) + 5; attempts; attempts--)
@@ -4081,7 +4081,7 @@ bool multiply_monster(int m_idx, bool clone, u32b mode)
        if (!mon_scatter(&y, &x, m_ptr->fy, m_ptr->fx, 1))
                return FALSE;
 
-       if (m_ptr->mflag2 & MFLAG_NOPET) mode |= PM_NO_PET;
+       if (m_ptr->mflag2 & MFLAG2_NOPET) mode |= PM_NO_PET;
 
        /* Create a new monster (awake, no groups) */
        if (!place_monster_aux(m_idx, y, x, m_ptr->r_idx, (mode | PM_NO_KAGE)))
@@ -4090,7 +4090,7 @@ bool multiply_monster(int m_idx, bool clone, u32b mode)
        if (clone)
        {
                m_list[hack_m_idx_ii].smart |= SM_CLONED;
-               m_list[hack_m_idx_ii].mflag2 |= MFLAG_NOPET;
+               m_list[hack_m_idx_ii].mflag2 |= MFLAG2_NOPET;
        }
 
        return TRUE;

diff --git a/src/mutation.c b/src/mutation.c
index 8c73862..d54e820 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -3758,7 +3758,7 @@ bool mutation_power_aux(u32b power)
                                    !(r_ptr->flags1 & RF1_UNIQUE) &&
                                    !p_ptr->inside_arena && !p_ptr->inside_quest &&
                                        (r_ptr->level < randint1(p_ptr->lev+50)) &&
-                                       !(m_ptr->mflag2 & MFLAG_NOGENO))
+                                       !(m_ptr->mflag2 & MFLAG2_NOGENO))
                                {
                                        /* Delete the monster, rather than killing it. */
                                        delete_monster_idx(c_ptr->m_idx);
@@ -3777,7 +3777,7 @@ bool mutation_power_aux(u32b power)
                                        msg_print("Your invocation is ineffectual!");
 #endif
 
-                                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG_NOGENO;
+                                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
                                }
                        }
                        break;

diff --git a/src/spells1.c b/src/spells1.c
index 3306a3e..5b04577 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -3818,7 +3818,7 @@ note = "
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & RF1_QUESTOR) ||
                            (r_ptr->flags3 & RF3_NO_CONF) ||
-                           (m_ptr->mflag2 & MFLAG_NOPET) ||
+                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
                            (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 5))
                        {
                                /* Memorize a flag */
@@ -3837,7 +3837,7 @@ note = "
 
                                obvious = FALSE;
 
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
@@ -3847,7 +3847,7 @@ note = "
                                note = " hates you too much!";
 #endif
 
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
@@ -3905,7 +3905,7 @@ note = "
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & RF1_QUESTOR) ||
                          (!(r_ptr->flags3 & RF3_UNDEAD)) ||
-                           (m_ptr->mflag2 & MFLAG_NOPET) ||
+                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
                                 (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
                                /* No obvious effect */
@@ -3916,7 +3916,7 @@ note = "
 #endif
 
                                obvious = FALSE;
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
@@ -3926,7 +3926,7 @@ note = "
                                note = " hates you too much!";
 #endif
 
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
@@ -3980,7 +3980,7 @@ note = "
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & RF1_QUESTOR) ||
                          (!(r_ptr->flags3 & RF3_DEMON)) ||
-                           (m_ptr->mflag2 & MFLAG_NOPET) ||
+                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
                                 (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
                                /* No obvious effect */
@@ -3991,7 +3991,7 @@ note = "
 #endif
 
                                obvious = FALSE;
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
@@ -4001,7 +4001,7 @@ note = "
                                note = " hates you too much!";
 #endif
 
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
@@ -4056,7 +4056,7 @@ note = "
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
                          (!(r_ptr->flags3 & (RF3_ANIMAL))) ||
-                           (m_ptr->mflag2 & MFLAG_NOPET) ||
+                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
                                 (r_ptr->flags3 & (RF3_NO_CONF)) ||
                                 (r_ptr->level > randint1((dam - 10) < 1 ? 1 : (dam - 10)) + 10))
                        {
@@ -4075,7 +4075,7 @@ note = "
 #endif
 
                                obvious = FALSE;
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
@@ -4085,7 +4085,7 @@ note = "
                                note = " hates you too much!";
 #endif
 
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
@@ -4151,7 +4151,7 @@ msg_format("%s
 
                        /* Attempt a saving throw */
                        if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
-                           (m_ptr->mflag2 & MFLAG_NOPET) ||
+                           (m_ptr->mflag2 & MFLAG2_NOPET) ||
                                 (r_ptr->flags3 & (RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING)) ||
                                 ((r_ptr->level+10) > randint1(dam)))
                        {
@@ -4164,7 +4164,7 @@ note = "
 #endif
 
                                obvious = FALSE;
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else if (p_ptr->cursed & TRC_AGGRAVATE)
                        {
@@ -4174,7 +4174,7 @@ note = "
                                note = " hates you too much!";
 #endif
 
-                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                               if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                        }
                        else
                        {
@@ -5346,7 +5346,7 @@ msg_format("
                        }
                        else if (m_ptr->hp < randint0(nokori_hp))
                        {
-                               if (m_ptr->mflag2 & MFLAG_CHAMELEON) choose_new_monster(c_ptr->m_idx, FALSE, MON_CHAMELEON);
+                               if (m_ptr->mflag2 & MFLAG2_CHAMELEON) choose_new_monster(c_ptr->m_idx, FALSE, MON_CHAMELEON);
 #ifdef JP
 msg_format("%s¤òÊᤨ¤¿¡ª",m_name);
 #else
@@ -5621,7 +5621,7 @@ note = "
                        }
                        else
                        {
-                               if ((r_ptr->level > randint0(dam)) || (m_ptr->mflag2 & MFLAG_NOGENO))
+                               if ((r_ptr->level > randint0(dam)) || (m_ptr->mflag2 & MFLAG2_NOGENO))
                                {
                                        dam = 0;
                                        angry = TRUE;
@@ -5662,7 +5662,7 @@ note = "
                                note = "is unaffected!";
 #endif
                                get_angry = TRUE;
-                               if (one_in_(13)) m_ptr->mflag2 |= MFLAG_NOGENO;
+                               if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
                        }
                        break;
                }
@@ -5751,12 +5751,12 @@ note_dies = "
                                /* Attempt a saving throw */
                                else if ((r_ptr->flags1 & (RF1_QUESTOR)) ||
                                    (r_ptr->flags1 & (RF1_UNIQUE)) ||
-                                   (m_ptr->mflag2 & MFLAG_NOPET) ||
+                                   (m_ptr->mflag2 & MFLAG2_NOPET) ||
                                    (p_ptr->cursed & TRC_AGGRAVATE) ||
                                         ((r_ptr->level+10) > randint1(dam)))
                                {
                                        /* Resist */
-                                       if (one_in_(4)) m_ptr->mflag2 |= MFLAG_NOPET;
+                                       if (one_in_(4)) m_ptr->mflag2 |= MFLAG2_NOPET;
                                }
                                else
                                {

diff --git a/src/spells2.c b/src/spells2.c
index 15af173..12aa84a 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4720,7 +4720,7 @@ void aggravate_monsters(int who)
                                m_ptr->csleep = 0;
                                sleep = TRUE;
                        }
-                       if (!is_pet(m_ptr)) m_ptr->mflag2 |= MFLAG_NOPET;
+                       if (!is_pet(m_ptr)) m_ptr->mflag2 |= MFLAG2_NOPET;
                }
 
                /* Speed up monsters in line of sight */
@@ -4799,7 +4799,7 @@ while(!get_com("
 
                else if (player_cast && (r_ptr->level > randint0(power))) angry = TRUE;
 
-               else if (player_cast && (m_ptr->mflag2 & MFLAG_NOGENO)) angry = TRUE;
+               else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) angry = TRUE;
 
                /* Delete the monster */
                else delete_monster_idx(i);
@@ -4839,7 +4839,7 @@ msg_format("%^s
                                }
                                set_hostile(m_ptr);
                        }
-                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG_NOGENO;
+                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
                }
 
                if (player_cast)
@@ -4928,7 +4928,7 @@ bool mass_genocide(int power, int player_cast)
 
                else if (player_cast && (r_ptr->level > randint0(power))) angry = TRUE;
 
-               else if (player_cast && (m_ptr->mflag2 & MFLAG_NOGENO)) angry = TRUE;
+               else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) angry = TRUE;
 
                /* Delete the monster */
                else delete_monster_idx(i);
@@ -4968,7 +4968,7 @@ msg_format("%^s
                                }
                                set_hostile(m_ptr);
                        }
-                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG_NOGENO;
+                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
                }
 
                if (player_cast)
@@ -5060,7 +5060,7 @@ bool mass_genocide_undead(int power, int player_cast)
 
                else if (player_cast && (r_ptr->level > randint0(power))) angry = TRUE;
 
-               else if (player_cast && (m_ptr->mflag2 & MFLAG_NOGENO)) angry = TRUE;
+               else if (player_cast && (m_ptr->mflag2 & MFLAG2_NOGENO)) angry = TRUE;
 
                /* Delete the monster */
                else delete_monster_idx(i);
@@ -5100,7 +5100,7 @@ msg_format("%^s
                                }
                                set_hostile(m_ptr);
                        }
-                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG_NOGENO;
+                       if (one_in_(13)) m_ptr->mflag2 |= MFLAG2_NOGENO;
                }
 
                if (player_cast)
@@ -5193,8 +5193,8 @@ bool probing(void)
 
                        if (m_ptr->ap_r_idx != m_ptr->r_idx)
                        {
-                               if (m_ptr->mflag2 & MFLAG_KAGE)
-                                       m_ptr->mflag2 &= ~(MFLAG_KAGE);
+                               if (m_ptr->mflag2 & MFLAG2_KAGE)
+                                       m_ptr->mflag2 &= ~(MFLAG2_KAGE);
 
                                m_ptr->ap_r_idx = m_ptr->r_idx;
                                lite_spot(m_ptr->fy, m_ptr->fx);

diff --git a/src/spells3.c b/src/spells3.c
index 6a7ef26..3801f29 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -5514,7 +5514,7 @@ bool polymorph_monster(int y, int x)
 
        if (p_ptr->inside_arena || p_ptr->inside_battle) return (FALSE);
 
-       if ((p_ptr->riding == c_ptr->m_idx) || (m_ptr->mflag2 & MFLAG_KAGE)) return (FALSE);
+       if ((p_ptr->riding == c_ptr->m_idx) || (m_ptr->mflag2 & MFLAG2_KAGE)) return (FALSE);
 
        /* Memorize the monster before polymorphing */
        back_m = *m_ptr;
@@ -5530,7 +5530,7 @@ bool polymorph_monster(int y, int x)
                /* Get the monsters attitude */
                if (is_friendly(m_ptr)) mode |= PM_FORCE_FRIENDLY;
                if (is_pet(m_ptr)) mode |= PM_FORCE_PET;
-               if (m_ptr->mflag2 & MFLAG_NOPET) mode |= PM_NO_PET;
+               if (m_ptr->mflag2 & MFLAG2_NOPET) mode |= PM_NO_PET;
 
                /* "Kill" the "old" monster */
                delete_monster_idx(c_ptr->m_idx);

diff --git a/src/xtra2.c b/src/xtra2.c
index 80ff4e6..360fc89 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -702,7 +702,7 @@ void monster_death(int m_idx, bool drop_item)
                }
        }
 
-       if (m_ptr->mflag2 & MFLAG_CHAMELEON)
+       if (m_ptr->mflag2 & MFLAG2_CHAMELEON)
        {
                choose_new_monster(m_idx, TRUE, MON_CHAMELEON);
                r_ptr = &r_info[m_ptr->r_idx];
@@ -1689,7 +1689,7 @@ bool mon_take_hit(int m_idx, int dam, bool *fear, cptr note)
                        if (r_ptr->r_sights < MAX_SHORT) r_ptr->r_sights++;
                }
 
-               if (m_ptr->mflag2 & MFLAG_CHAMELEON)
+               if (m_ptr->mflag2 & MFLAG2_CHAMELEON)
                {
                        /* You might have unmasked Chameleon first time */
                        r_ptr = real_r_ptr(m_ptr);
@@ -1707,11 +1707,11 @@ bool mon_take_hit(int m_idx, int dam, bool *fear, cptr note)
                if (m_ptr->ml || (r_ptr->flags1 & RF1_UNIQUE))
                {
                        /* Count kills this life */
-                       if ((m_ptr->mflag2 & MFLAG_KAGE) && (r_info[MON_KAGE].r_pkills < MAX_SHORT)) r_info[MON_KAGE].r_pkills++;
+                       if ((m_ptr->mflag2 & MFLAG2_KAGE) && (r_info[MON_KAGE].r_pkills < MAX_SHORT)) r_info[MON_KAGE].r_pkills++;
                        else if (r_ptr->r_pkills < MAX_SHORT) r_ptr->r_pkills++;
 
                        /* Count kills in all lives */
-                       if ((m_ptr->mflag2 & MFLAG_KAGE) && (r_info[MON_KAGE].r_tkills < MAX_SHORT)) r_info[MON_KAGE].r_tkills++;
+                       if ((m_ptr->mflag2 & MFLAG2_KAGE) && (r_info[MON_KAGE].r_tkills < MAX_SHORT)) r_info[MON_KAGE].r_tkills++;
                        else if (r_ptr->r_tkills < MAX_SHORT) r_ptr->r_tkills++;
 
                        /* Hack -- Auto-recall */
@@ -1951,7 +1951,7 @@ msg_format("%s
                {
                        for (i = 0; i < MAX_KUBI; i++)
                        {
-                               if ((kubi_r_idx[i] == m_ptr->r_idx) && !(m_ptr->mflag2 & MFLAG_CHAMELEON))
+                               if ((kubi_r_idx[i] == m_ptr->r_idx) && !(m_ptr->mflag2 & MFLAG2_CHAMELEON))
                                {
 #ifdef JP
 msg_format("%s¤Î¼ó¤Ë¤Ï¾Þ¶â¤¬¤«¤«¤Ã¤Æ¤¤¤ë¡£", m_name);
@@ -2491,7 +2491,7 @@ cptr look_mon_desc(int m_idx, u32b mode)
        }
 
        /* Display monster's level --- idea borrowed from ToME */
-       if (ap_r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG_KAGE))
+       if (ap_r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG2_KAGE))
        {
 #ifdef JP
                return format("¥ì¥Ù¥ë%d, %s%s%s", ap_r_ptr->level, desc, attitude, clone);
@@ -2965,7 +2965,7 @@ static void evaluate_monster_exp(char *buf, monster_type *m_ptr)
        M_INT_SUB(exp_adv_h, exp_adv_l, p_ptr->exp, p_ptr->exp_frac);
        if ((p_ptr->lev>=PY_MAX_LEVEL) || (p_ptr->prace == RACE_ANDROID))
                sprintf(buf,"**");
-       else if (!ap_r_ptr->r_tkills || (m_ptr->mflag2 & MFLAG_KAGE))
+       else if (!ap_r_ptr->r_tkills || (m_ptr->mflag2 & MFLAG2_KAGE))
                sprintf(buf,"??");
        else if (M_INT_GREATER(exp_mon_h, exp_mon_l, exp_adv_h, exp_adv_l))
                sprintf(buf,"001");