#37287 #37353 (2.2.0.89) 型の置換を継続中。 / Ongoing type replacement.

diff --git a/src/artifact.c b/src/artifact.c
index 90e4e99..54079a6 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -3598,7 +3598,7 @@ bool activate_random_artifact(object_type *o_ptr)
                {
                        int num = 1;
                        int i;
-                       int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+                       BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
                        int tx, ty;
 
                        /* Only for Crimson */

diff --git a/src/autopick.c b/src/autopick.c
index 2594f76..39c5912 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -2932,7 +2932,7 @@ static void free_text_lines(cptr *lines_list)
 /*
  * Delete or insert string
  */
-static void toggle_keyword(text_body_type *tb, int flg)
+static void toggle_keyword(text_body_type *tb, BIT_FLAGS flg)
 {
        int by1, by2, y;
        bool add = TRUE;
@@ -3104,7 +3104,7 @@ static void toggle_command_letter(text_body_type *tb, byte flg)
 /*
  * Delete or insert string
  */
-static void add_keyword(text_body_type *tb, int flg)
+static void add_keyword(text_body_type *tb, BIT_FLAGS flg)
 {
        int by1, by2, y;
 

diff --git a/src/externs.h b/src/externs.h
index 6862ab8..1d42792 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1094,9 +1094,9 @@ extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSIT
 extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int typ);
 extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell);
 extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ);
-extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg);
+extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, BIT_FLAGS flg);
 extern POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-extern bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell);
+extern bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, int monspell);
 extern int project_length;
 extern bool binding_field(HIT_POINT dam);
 extern void seal_of_mirror(HIT_POINT dam);
@@ -1204,7 +1204,7 @@ extern s32b flag_cost(object_type *o_ptr, int plusses);
 extern void report_magics(void);
 extern bool teleport_swap(int dir);
 extern bool item_tester_hook_recharge(object_type *o_ptr);
-extern bool project_hook(int typ, int dir, HIT_POINT dam, int flg);
+extern bool project_hook(int typ, int dir, HIT_POINT dam, BIT_FLAGS flg);
 extern bool project_hack(int typ, HIT_POINT dam);
 extern bool eat_magic(int power);
 extern void discharge_minion(void);
@@ -1570,7 +1570,7 @@ extern void bolt(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monsp
 extern void breath(int y, int x, MONSTER_IDX m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, int target_type);
 
 /* mspells2.c */
-extern void get_project_point(int sy, int sx, int *ty, int *tx, int flg);
+extern void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg);
 extern bool monst_spell_monst(MONSTER_IDX m_idx);
 
 /* mspells3.c */

diff --git a/src/melee1.c b/src/melee1.c
index fc0f17c..7b8a8d3 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1924,7 +1924,7 @@ bool make_attack_normal(MONSTER_IDX m_idx)
                                                else /* monster does not dead */
                                                {
                                                        int j;
-                                                       int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+                                                       BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
                                                        int typ[4][2] = {
                                                                { INVEN_HEAD, GF_OLD_CONF },
                                                                { INVEN_LARM,  GF_OLD_SLEEP },

diff --git a/src/mspells1.c b/src/mspells1.c
index 246348d..85e7542 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -511,7 +511,7 @@ bool clean_shot(int y1, int x1, int y2, int x2, bool is_friend)
  */
 void bolt(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type)
   {
-    int flg;
+    BIT_FLAGS flg;
     bool learnable = spell_learnable(m_idx);
 
     switch (target_type)
@@ -542,7 +542,7 @@ void bolt(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, in
  */
 void beam(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type)
 {
-    int flg = 0;
+    BIT_FLAGS flg = 0;
     bool learnable = spell_learnable(m_idx);
 
     switch (target_type)
@@ -579,7 +579,7 @@ void breath(int y, int x, MONSTER_IDX m_idx, int typ, int dam_hp, int rad, bool
     monster_type *m_ptr = &m_list[m_idx];
     monster_race *r_ptr = &r_info[m_ptr->r_idx];
     bool learnable = spell_learnable(m_idx);
-       int flg = 0x00;
+       BIT_FLAGS flg = 0x00;
 
     switch (target_type)
     {

diff --git a/src/mspells2.c b/src/mspells2.c
index f8c85f9..2913919 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -94,7 +94,7 @@ static bool breath_direct(POSITION y1, POSITION x1, POSITION y2, POSITION x2, PO
        bool hit2 = FALSE;
        bool hityou = FALSE;
 
-       int flg;
+       BIT_FLAGS flg;
 
        switch (typ)
        {
@@ -191,7 +191,7 @@ static bool breath_direct(POSITION y1, POSITION x1, POSITION y2, POSITION x2, PO
  * @param flg 判定のフラグ配列
  * @return なし
  */
-void get_project_point(int sy, int sx, int *ty, int *tx, int flg)
+void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg)
 {
        u16b path_g[128];
        int  path_n, i;

diff --git a/src/spells1.c b/src/spells1.c
index ff9d46c..92dbfcc 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -298,7 +298,7 @@ u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ)
  * by "update_view_los()", and very different from the one used by "los()".
  * </pre>
  */
-sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg)
+sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, BIT_FLAGS flg)
 {
        int y, x;
 
@@ -1585,7 +1585,7 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
  * "flg" was added.
  * </pre>
  */
-static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, bool see_s_msg)
+static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, bool see_s_msg)
 {
        int tmp;
 
@@ -5173,7 +5173,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
  * We return "TRUE" if any "obvious" effects were observed.  XXX XXX Actually,
  * we just assume that the effects were obvious, for historical reasons.
  */
-static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell)
+static bool project_p(int who, cptr who_name, int r, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, int monspell)
 {
        int k = 0;
        int rlev = 0;
@@ -6773,7 +6773,7 @@ void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *g
  * and "update_view()" and "update_monsters()" need to be called.
  * </pre>
  */
-bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, int flg, int monspell)
+bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int typ, BIT_FLAGS flg, int monspell)
 {
        int i, t, dist;
 

diff --git a/src/spells2.c b/src/spells2.c
index 8e0dfbc..69beaa6 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4594,7 +4594,7 @@ void unlite_room(int y1, int x1)
  */
 bool lite_area(HIT_POINT dam, int rad)
 {
-       int flg = PROJECT_GRID | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_KILL;
 
        if (d_info[dungeon_type].flags1 & DF1_DARKNESS)
        {
@@ -4627,7 +4627,7 @@ bool lite_area(HIT_POINT dam, int rad)
  */
 bool unlite_area(HIT_POINT dam, int rad)
 {
-       int flg = PROJECT_GRID | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_KILL;
 
        /* Hack -- Message */
        if (!p_ptr->blind)
@@ -4665,7 +4665,7 @@ bool fire_ball(int typ, int dir, HIT_POINT dam, int rad)
 {
        int tx, ty;
 
-       int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
        if (typ == GF_CONTROL_LIVING) flg|= PROJECT_HIDE;
        /* Use the given direction */
@@ -4704,7 +4704,7 @@ bool fire_rocket(int typ, int dir, HIT_POINT dam, int rad)
 {
        int tx, ty;
 
-       int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
        /* Use the given direction */
        tx = p_ptr->x + 99 * ddx[dir];
@@ -4740,7 +4740,7 @@ bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad)
 {
        int tx, ty;
 
-       int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_HIDE;
 
        /* Use the given direction */
        tx = p_ptr->x + 99 * ddx[dir];
@@ -4779,7 +4779,7 @@ bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad)
  */
 bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION y, POSITION x, HIT_POINT dam, POSITION rad)
 {
-       int flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
 
        /* Analyze the "target" and the caster. */
        return (project(who, rad, y, x, dam, typ, flg, -1));
@@ -4802,7 +4802,7 @@ bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev)
        int ty, tx, y, x;
        int i;
 
-       int flg = PROJECT_FAST | PROJECT_THRU | PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE | PROJECT_GRID;
+       BIT_FLAGS flg = PROJECT_FAST | PROJECT_THRU | PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE | PROJECT_GRID;
 
        /* Assume okay */
        bool result = TRUE;
@@ -4928,7 +4928,7 @@ bool teleport_swap(int dir)
  * @param flg フラグ
  * @return 作用が実際にあった場合TRUEを返す
  */
-bool project_hook(int typ, int dir, HIT_POINT dam, int flg)
+bool project_hook(int typ, int dir, HIT_POINT dam, BIT_FLAGS flg)
 {
        int tx, ty;
 
@@ -4965,7 +4965,7 @@ bool project_hook(int typ, int dir, HIT_POINT dam, int flg)
  */
 bool fire_bolt(int typ, int dir, HIT_POINT dam)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_GRID;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_GRID;
        if (typ != GF_ARROW) flg |= PROJECT_REFLECTABLE;
        return (project_hook(typ, dir, dam, flg));
 }
@@ -4985,7 +4985,7 @@ bool fire_bolt(int typ, int dir, HIT_POINT dam)
  */
 bool fire_beam(int typ, int dir, HIT_POINT dam)
 {
-       int flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_GRID | PROJECT_ITEM;
+       BIT_FLAGS flg = PROJECT_BEAM | PROJECT_KILL | PROJECT_GRID | PROJECT_ITEM;
        return (project_hook(typ, dir, dam, flg));
 }
 
@@ -5023,7 +5023,7 @@ bool fire_bolt_or_beam(int prob, int typ, int dir, HIT_POINT dam)
  */
 bool lite_line(int dir, HIT_POINT dam)
 {
-       int flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_KILL;
        return (project_hook(GF_LITE_WEAK, dir, dam, flg));
 }
 
@@ -5035,7 +5035,7 @@ bool lite_line(int dir, HIT_POINT dam)
  */
 bool drain_life(int dir, HIT_POINT dam)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_DRAIN, dir, dam, flg));
 }
 
@@ -5047,7 +5047,7 @@ bool drain_life(int dir, HIT_POINT dam)
  */
 bool wall_to_mud(int dir, HIT_POINT dam)
 {
-       int flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
        return (project_hook(GF_KILL_WALL, dir, dam, flg));
 }
 
@@ -5058,7 +5058,7 @@ bool wall_to_mud(int dir, HIT_POINT dam)
  */
 bool wizard_lock(int dir)
 {
-       int flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
        return (project_hook(GF_JAM_DOOR, dir, 20 + randint1(30), flg));
 }
 
@@ -5069,7 +5069,7 @@ bool wizard_lock(int dir)
  */
 bool destroy_door(int dir)
 {
-       int flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM;
+       BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM;
        return (project_hook(GF_KILL_DOOR, dir, 0, flg));
 }
 
@@ -5080,7 +5080,7 @@ bool destroy_door(int dir)
  */
 bool disarm_trap(int dir)
 {
-       int flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM;
+       BIT_FLAGS flg = PROJECT_BEAM | PROJECT_GRID | PROJECT_ITEM;
        return (project_hook(GF_KILL_TRAP, dir, 0, flg));
 }
 
@@ -5092,7 +5092,7 @@ bool disarm_trap(int dir)
  */
 bool heal_monster(int dir, HIT_POINT dam)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_HEAL, dir, dam, flg));
 }
 
@@ -5104,7 +5104,7 @@ bool heal_monster(int dir, HIT_POINT dam)
  */
 bool speed_monster(int dir, int power)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_SPEED, dir, power, flg));
 }
 
@@ -5116,7 +5116,7 @@ bool speed_monster(int dir, int power)
  */
 bool slow_monster(int dir, int power)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_SLOW, dir, power, flg));
 }
 
@@ -5128,7 +5128,7 @@ bool slow_monster(int dir, int power)
  */
 bool sleep_monster(int dir, int power)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_SLEEP, dir, power, flg));
 }
 
@@ -5162,7 +5162,7 @@ bool stasis_evil(int dir)
  */
 bool confuse_monster(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_CONF, dir, plev, flg));
 }
 
@@ -5174,7 +5174,7 @@ bool confuse_monster(int dir, int plev)
  */
 bool stun_monster(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_STUN, dir, plev, flg));
 }
 
@@ -5186,7 +5186,7 @@ bool stun_monster(int dir, int plev)
  */
 bool poly_monster(int dir, int power)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        bool tester = (project_hook(GF_OLD_POLY, dir, power, flg));
        if (tester)
                chg_virtue(V_CHANCE, 1);
@@ -5200,7 +5200,7 @@ bool poly_monster(int dir, int power)
  */
 bool clone_monster(int dir)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_OLD_CLONE, dir, 0, flg));
 }
 
@@ -5212,7 +5212,7 @@ bool clone_monster(int dir)
  */
 bool fear_monster(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_TURN_ALL, dir, plev, flg));
 }
 
@@ -5224,7 +5224,7 @@ bool fear_monster(int dir, int plev)
  */
 bool death_ray(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL | PROJECT_REFLECTABLE;
        return (project_hook(GF_DEATH_RAY, dir, plev * 200, flg));
 }
 
@@ -5236,7 +5236,7 @@ bool death_ray(int dir, int plev)
  */
 bool teleport_monster(int dir, int distance)
 {
-       int flg = PROJECT_BEAM | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_BEAM | PROJECT_KILL;
        return (project_hook(GF_AWAY_ALL, dir, distance, flg));
 }
 
@@ -5246,7 +5246,7 @@ bool teleport_monster(int dir, int distance)
  */
 bool door_creation(void)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
        return (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_MAKE_DOOR, flg, -1));
 }
 
@@ -5258,7 +5258,7 @@ bool door_creation(void)
  */
 bool trap_creation(int y, int x)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
        return (project(0, 1, y, x, 0, GF_MAKE_TRAP, flg, -1));
 }
 
@@ -5268,7 +5268,7 @@ bool trap_creation(int y, int x)
  */
 bool tree_creation(void)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
        return (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_MAKE_TREE, flg, -1));
 }
 
@@ -5278,7 +5278,7 @@ bool tree_creation(void)
  */
 bool glyph_creation(void)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM;
        return (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_MAKE_GLYPH, flg, -1));
 }
 
@@ -5288,7 +5288,7 @@ bool glyph_creation(void)
  */
 bool wall_stone(void)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
 
        bool dummy = (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_STONE_WALL, flg, -1));
 
@@ -5307,7 +5307,7 @@ bool wall_stone(void)
  */
 bool destroy_doors_touch(void)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
        return (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_KILL_DOOR, flg, -1));
 }
 
@@ -5317,7 +5317,7 @@ bool destroy_doors_touch(void)
  */
 bool disarm_traps_touch(void)
 {
-       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_HIDE;
        return (project(0, 1, p_ptr->y, p_ptr->x, 0, GF_KILL_TRAP, flg, -1));
 }
 
@@ -5327,7 +5327,7 @@ bool disarm_traps_touch(void)
  */
 bool sleep_monsters_touch(void)
 {
-       int flg = PROJECT_KILL | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_KILL | PROJECT_HIDE;
        return (project(0, 1, p_ptr->y, p_ptr->x, p_ptr->lev, GF_OLD_SLEEP, flg, -1));
 }
 
@@ -5341,7 +5341,7 @@ bool sleep_monsters_touch(void)
  */
 bool animate_dead(MONSTER_IDX who, POSITION y, POSITION x)
 {
-       int flg = PROJECT_ITEM | PROJECT_HIDE;
+       BIT_FLAGS flg = PROJECT_ITEM | PROJECT_HIDE;
        return (project(who, 5, y, x, 0, GF_ANIM_DEAD, flg, -1));
 }
 
@@ -5412,7 +5412,7 @@ bool activate_ty_curse(bool stop_ty, int *count)
 {
        int     i = 0;
 
-       int flg = (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP);
+       BIT_FLAGS flg = (PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL | PROJECT_JUMP);
 
        do
        {
@@ -5799,7 +5799,7 @@ bool deathray_monsters(void)
  */
 bool charm_monster(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CHARM, dir, plev, flg));
 }
 
@@ -5811,7 +5811,7 @@ bool charm_monster(int dir, int plev)
  */
 bool control_one_undead(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CONTROL_UNDEAD, dir, plev, flg));
 }
 
@@ -5823,7 +5823,7 @@ bool control_one_undead(int dir, int plev)
  */
 bool control_one_demon(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CONTROL_DEMON, dir, plev, flg));
 }
 
@@ -5835,7 +5835,7 @@ bool control_one_demon(int dir, int plev)
  */
 bool charm_animal(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CONTROL_ANIMAL, dir, plev, flg));
 }
 
@@ -5847,7 +5847,7 @@ bool charm_animal(int dir, int plev)
  */
 bool charm_living(int dir, int plev)
 {
-       int flg = PROJECT_STOP | PROJECT_KILL;
+       BIT_FLAGS flg = PROJECT_STOP | PROJECT_KILL;
        return (project_hook(GF_CONTROL_LIVING, dir, plev, flg));
 }
 

diff --git a/src/xtra2.c b/src/xtra2.c
index dd7cf09..0eb79c9 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -792,7 +792,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        {
                if (r_ptr->blow[i].method == RBM_EXPLODE)
                {
-                       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+                       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
                        int typ = mbe_info[r_ptr->blow[i].effect].explode_type;
                        DICE_NUMBER d_dice = r_ptr->blow[i].d_dice;
                        DICE_SID d_side = r_ptr->blow[i].d_side;
@@ -1017,7 +1017,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
        case MON_UNMAKER:
                /* One more ultra-hack: An Unmaker goes out with a big bang! */
                {
-                       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+                       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
                        (void)project(m_idx, 6, y, x, 100, GF_CHAOS, flg, -1);
                }
                break;
@@ -1132,7 +1132,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
        case MON_ROLENTO:
                {
-                       int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+                       BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
                        (void)project(m_idx, 3, y, x, damroll(20, 10), GF_FIRE, flg, -1);
                }
                break;