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

diff --git a/src/artifact.c b/src/artifact.c
index 776cfe5..90e4e99 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2734,7 +2734,7 @@ bool activate_random_artifact(object_type *o_ptr)
                case ACT_SUMMON_ELEMENTAL:
                {
                        bool pet = one_in_(3);
-                       u32b mode = 0L;
+                       BIT_FLAGS mode = 0L;
 
                        if (!(pet && (plev < 50))) mode |= PM_ALLOW_GROUP;
                        if (pet) mode |= PM_FORCE_PET;
@@ -2755,7 +2755,7 @@ bool activate_random_artifact(object_type *o_ptr)
                case ACT_SUMMON_DEMON:
                {
                        bool pet = one_in_(3);
-                       u32b mode = 0L;
+                       BIT_FLAGS mode = 0L;
 
                        if (!(pet && (plev < 50))) mode |= PM_ALLOW_GROUP;
                        if (pet) mode |= PM_FORCE_PET;
@@ -2777,7 +2777,7 @@ bool activate_random_artifact(object_type *o_ptr)
                {
                        bool pet = one_in_(3);
                        int type;
-                       u32b mode = 0L;
+                       BIT_FLAGS mode = 0L;
 
                        type = (plev > 47 ? SUMMON_HI_UNDEAD : SUMMON_UNDEAD);
 
@@ -2802,7 +2802,7 @@ bool activate_random_artifact(object_type *o_ptr)
 
                case ACT_SUMMON_HOUND:
                {
-                       u32b mode = PM_ALLOW_GROUP;
+                       BIT_FLAGS mode = PM_ALLOW_GROUP;
                        bool pet = !one_in_(5);
                        if (pet) mode |= PM_FORCE_PET;
                        else mode |= PM_NO_PET;
@@ -2830,7 +2830,7 @@ bool activate_random_artifact(object_type *o_ptr)
 
                case ACT_SUMMON_OCTOPUS:
                {
-                       u32b mode = PM_ALLOW_GROUP;
+                       BIT_FLAGS mode = PM_ALLOW_GROUP;
                        bool pet = !one_in_(5);
                        if (pet) mode |= PM_FORCE_PET;
 

diff --git a/src/cmd2.c b/src/cmd2.c
index 7d71998..022d60c 100644 (file)
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -471,7 +471,7 @@ static void chest_death(bool scatter, int y, int x, s16b o_idx)
        int number;
 
        bool small;
-       u32b mode = AM_GOOD;
+       BIT_FLAGS mode = AM_GOOD;
 
        object_type forge;
        object_type *q_ptr;

diff --git a/src/dungeon.c b/src/dungeon.c
index cf500e7..91c3560 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -2319,7 +2319,7 @@ static void process_world_aux_mutation(void)
            !p_ptr->anti_magic && (randint1(6666) == 666))
        {
                bool pet = one_in_(6);
-               u32b mode = PM_ALLOW_GROUP;
+               BIT_FLAGS mode = PM_ALLOW_GROUP;
 
                if (pet) mode |= PM_FORCE_PET;
                else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
@@ -2430,7 +2430,7 @@ static void process_world_aux_mutation(void)
            !p_ptr->anti_magic && one_in_(7000))
        {
                bool pet = one_in_(3);
-               u32b mode = PM_ALLOW_GROUP;
+               BIT_FLAGS mode = PM_ALLOW_GROUP;
 
                if (pet) mode |= PM_FORCE_PET;
                else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
@@ -2510,7 +2510,7 @@ static void process_world_aux_mutation(void)
            !p_ptr->anti_magic && one_in_(3000))
        {
                bool pet = one_in_(5);
-               u32b mode = PM_ALLOW_GROUP;
+               BIT_FLAGS mode = PM_ALLOW_GROUP;
 
                if (pet) mode |= PM_FORCE_PET;
                else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);

diff --git a/src/externs.h b/src/externs.h
index 4efa362..6862ab8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -881,14 +881,14 @@ extern void get_table_sindarin_aux(char *out_string);
 extern void get_table_sindarin(char *out_string);
 extern void flavor_init(void);
 extern char *object_desc_kosuu(char *t, object_type *o_ptr);
-extern void object_desc(char *buf, object_type *o_ptr, u32b mode);
+extern void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode);
 
 /* floors.c */
 extern void init_saved_floors(bool force);
 extern void clear_saved_floor_files(void);
 extern saved_floor_type *get_sf_ptr(s16b floor_id);
 extern s16b get_new_floor_id(void);
-extern void prepare_change_floor_mode(u32b mode);
+extern void prepare_change_floor_mode(BIT_FLAGS mode);
 extern void precalc_cur_num_of_pet(void);
 extern void leave_floor(void);
 extern void change_floor(void);
@@ -916,7 +916,7 @@ extern cptr get_check_sum(void);
 
 /* load.c */
 extern errr rd_savefile_new(void);
-extern bool load_floor(saved_floor_type *sf_ptr, u32b mode);
+extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);
 
 /* melee1.c */
 /* melee2.c */
@@ -986,10 +986,10 @@ extern bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
 extern bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode);
 extern bool alloc_horde(POSITION y, POSITION x);
 extern bool alloc_guardian(bool def_val);
-extern bool alloc_monster(int dis, u32b mode);
+extern bool alloc_monster(int dis, BIT_FLAGS mode);
 extern bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode);
 extern bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode);
-extern bool multiply_monster(MONSTER_IDX m_idx, bool clone, u32b mode);
+extern bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode);
 extern void update_smart_learn(MONSTER_IDX m_idx, int what);
 extern void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx);
 extern byte get_mspeed(monster_race *r_ptr);
@@ -1003,7 +1003,7 @@ extern void reset_visuals(void);
 extern void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE]);
 extern void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE]);
 extern cptr item_activation(object_type *o_ptr);
-extern bool screen_object(object_type *o_ptr, u32b mode);
+extern bool screen_object(object_type *o_ptr, BIT_FLAGS mode);
 extern char index_to_label(int i);
 extern INVENTORY_IDX label_to_inven(int c);
 extern INVENTORY_IDX label_to_equip(int c);
@@ -1087,7 +1087,7 @@ extern void do_cmd_racial_power(void);
 extern bool save_player(void);
 extern bool load_player(void);
 extern void remove_loc(void);
-extern bool save_floor(saved_floor_type *sf_ptr, u32b mode);
+extern bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);
 
 /* spells1.c */
 extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
@@ -1213,13 +1213,13 @@ extern bool rush_attack(bool *mdeath);
 extern void remove_all_mirrors(bool explode);
 
 /* spells3.c */
-extern bool teleport_away(MONSTER_IDX m_idx, int dis, u32b mode);
-extern void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, u32b mode);
-extern bool cave_player_teleportable_bold(int y, int x, u32b mode);
-extern bool teleport_player_aux(int dis, u32b mode);
-extern void teleport_player(int dis, u32b mode);
+extern bool teleport_away(MONSTER_IDX m_idx, int dis, BIT_FLAGS mode);
+extern void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, BIT_FLAGS mode);
+extern bool cave_player_teleportable_bold(int y, int x, BIT_FLAGS mode);
+extern bool teleport_player_aux(int dis, BIT_FLAGS mode);
+extern void teleport_player(int dis, BIT_FLAGS mode);
 extern void teleport_player_away(MONSTER_IDX m_idx, int dis);
-extern void teleport_player_to(POSITION ny, POSITION nx, u32b mode);
+extern void teleport_player_to(POSITION ny, POSITION nx, BIT_FLAGS mode);
 extern void teleport_away_followable(MONSTER_IDX m_idx);
 extern void teleport_level(MONSTER_IDX m_idx);
 extern DUNGEON_IDX choose_dungeon(cptr note, POSITION y, POSITION x);
@@ -1281,7 +1281,7 @@ extern bool brand_bolts(void);
 extern bool polymorph_monster(POSITION y, POSITION x);
 extern bool dimension_door(void);
 extern bool mirror_tunnel(void);
-extern bool summon_kin_player(int level, int y, int x, u32b mode);
+extern bool summon_kin_player(int level, int y, int x, BIT_FLAGS mode);
 extern void massacre(void);
 
 /* store.c */
@@ -1496,7 +1496,7 @@ extern void resize_map(void);
 extern void redraw_window(void);
 extern bool change_panel(int dy, int dx);
 extern void verify_panel(void);
-extern cptr look_mon_desc(monster_type *m_ptr, u32b mode);
+extern cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode);
 extern void ang_sort_aux(vptr u, vptr v, int p, int q);
 extern void ang_sort(vptr u, vptr v, int n);
 extern bool target_able(MONSTER_IDX m_idx);

diff --git a/src/flavor.c b/src/flavor.c
index 29e7f5f..5bb259e 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -1316,7 +1316,7 @@ bool object_is_quest_target(object_type *o_ptr)
  *   OD_NO_FLAVOR        : Allow to hidden flavor\n
  *   OD_FORCE_FLAVOR     : Get un-shuffled flavor name\n
  */
-void object_desc(char *buf, object_type *o_ptr, u32b mode)
+void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode)
 {
        /* Extract object kind name */
        cptr            kindname = k_name + k_info[o_ptr->k_idx].name;

diff --git a/src/floors.c b/src/floors.c
index 20f14df..cfc010f 100644 (file)
--- a/src/floors.c
+++ b/src/floors.c
@@ -304,7 +304,7 @@ s16b get_new_floor_id(void)
  * @param mode 追加したい所持フラグ
  * @return なし
  */
-void prepare_change_floor_mode(u32b mode)
+void prepare_change_floor_mode(BIT_FLAGS mode)
 {
        change_floor_mode |= mode;
 }

diff --git a/src/generate.c b/src/generate.c
index 4c60d4b..dc361de 100644 (file)
--- a/src/generate.c
+++ b/src/generate.c
@@ -486,7 +486,7 @@ bool place_quest_monsters(void)
        for (i = 0; i < max_quests; i++)
        {
                monster_race *r_ptr;
-               u32b mode;
+               BIT_FLAGS mode;
                int j;
 
                if (quest[i].status != QUEST_STATUS_TAKEN ||

diff --git a/src/load.c b/src/load.c
index f2396f6..fd000ba 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -4085,7 +4085,7 @@ static bool load_floor_aux(saved_floor_type *sf_ptr)
  * @param mode オプション
  * @return 成功したらtrue
  */
-bool load_floor(saved_floor_type *sf_ptr, u32b mode)
+bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode)
 {
        FILE *old_fff = NULL;
        byte old_xor_byte = 0;

diff --git a/src/monster2.c b/src/monster2.c
index 484b994..6a294f9 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -3516,7 +3516,7 @@ static bool mon_scatter(MONRACE_IDX r_idx, POSITION *yp, POSITION *xp, POSITION
  * @param mode 生成オプション
  * @return 成功したらtrue
  */
-static bool place_monster_group(IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, u32b mode)
+static bool place_monster_group(IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode)
 {
        monster_race *r_ptr = &r_info[r_idx];
 
@@ -3904,7 +3904,7 @@ bool alloc_guardian(bool def_val)
  * Use "slp" to choose the initial "sleep" status
  * Use "monster_level" for the monster level
  */
-bool alloc_monster(int dis, u32b mode)
+bool alloc_monster(int dis, BIT_FLAGS mode)
 {
        int                     y = 0, x = 0;
        int         attempts_left = 10000;
@@ -4130,7 +4130,7 @@ bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_I
  * @details
  * Note that "reproduction" REQUIRES empty space.
  */
-bool multiply_monster(MONSTER_IDX m_idx, bool clone, u32b mode)
+bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode)
 {
        monster_type    *m_ptr = &m_list[m_idx];
 

diff --git a/src/mspells4.c b/src/mspells4.c
index 6cd077d..1ee670b 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -2026,7 +2026,7 @@ HIT_POINT spell_RF6_SPECIAL_ROLENTO(POSITION y, POSITION x, MONSTER_IDX m_idx, I
 {
        int count = 0, k;
        int num = 1 + randint1(3);
-       u32b mode = 0L;
+       BIT_FLAGS mode = 0L;
        
        monspell_message(m_idx, t_idx,
                _("%^sが何か大量に投げた。", "%^s spreads something."),
@@ -2567,7 +2567,7 @@ MONSTER_NUMBER summon_EAGLE(POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx)
  */
 MONSTER_NUMBER summon_IE(POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx)
 {
-       u32b mode = 0L;
+       BIT_FLAGS mode = 0L;
        int k, count = 0;       
        int num = 2 + randint1(1 + rlev / 20);
        for (k = 0; k < num; k++)
@@ -2624,7 +2624,7 @@ MONSTER_NUMBER summon_Guardian(POSITION y, POSITION x, int rlev, MONSTER_IDX m_i
 */
 MONSTER_NUMBER summon_LOCK_CLONE(POSITION y, POSITION x, int rlev, MONSTER_IDX m_idx)
 {
-       u32b mode = 0L;
+       BIT_FLAGS mode = 0L;
        int k, count = 0;
        int num = randint1(3);
        rlev;
@@ -3177,7 +3177,7 @@ void spell_RF6_S_DRAGON(POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_idx, in
 */
 MONSTER_NUMBER summon_NAZGUL(POSITION y, POSITION x, MONSTER_IDX m_idx)
 {
-       u32b mode = 0L;
+       BIT_FLAGS mode = 0L;
        int count = 0, k;
        POSITION cy = y;
        POSITION cx = x;

diff --git a/src/object1.c b/src/object1.c
index eff1db8..47f8e9b 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -510,7 +510,7 @@ cptr item_activation(object_type *o_ptr)
  * @param mode 表示オプション
  * @return 特筆すべき情報が一つでもあった場合TRUE、一つもなく表示がキャンセルされた場合FALSEを返す。
  */
-bool screen_object(object_type *o_ptr, u32b mode)
+bool screen_object(object_type *o_ptr, BIT_FLAGS mode)
 {
        int                     i = 0, j, k;
 

diff --git a/src/object2.c b/src/object2.c
index ce21624..2509dac 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -5440,7 +5440,7 @@ void acquirement(int y1, int x1, int num, bool great, bool special, bool known)
 {
        object_type *i_ptr;
        object_type object_type_body;
-       u32b mode = AM_GOOD | (great || special ? AM_GREAT : 0L) | (special ? AM_SPECIAL : 0L) ;
+       BIT_FLAGS mode = AM_GOOD | (great || special ? AM_GREAT : 0L) | (special ? AM_SPECIAL : 0L) ;
 
        /* Acquirement */
        while (num--)

diff --git a/src/save.c b/src/save.c
index 4632266..83cf4bf 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -2141,7 +2141,7 @@ static bool save_floor_aux(saved_floor_type *sf_ptr)
  * @param mode 保存オプション
  * @return なし
  */
-bool save_floor(saved_floor_type *sf_ptr, u32b mode)
+bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode)
 {
        FILE *old_fff = NULL;
        byte old_xor_byte = 0;

diff --git a/src/spells1.c b/src/spells1.c
index ecb26b2..ff9d46c 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1430,7 +1430,7 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                                if (o_ptr->tval == TV_CORPSE)
                                {
                                        int i;
-                                       u32b mode = 0L;
+                                       BIT_FLAGS mode = 0L;
 
                                        if (!who || is_pet(&m_list[who]))
                                                mode |= PM_FORCE_PET;
@@ -5033,7 +5033,7 @@ static bool project_m(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
                        case 19: case 20: case 21: case 22:
                        {
                                bool pet = !one_in_(3);
-                               u32b mode = PM_ALLOW_GROUP;
+                               BIT_FLAGS mode = PM_ALLOW_GROUP;
 
                                if (pet) mode |= PM_FORCE_PET;
                                else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);

diff --git a/src/spells2.c b/src/spells2.c
index 363723a..8e0dfbc 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -5527,7 +5527,7 @@ int activate_hi_summon(POSITION y, POSITION x, bool can_pet)
        int i;
        int count = 0;
        DEPTH summon_lev;
-       u32b mode = PM_ALLOW_GROUP;
+       BIT_FLAGS mode = PM_ALLOW_GROUP;
        bool pet = FALSE;
 
        if (can_pet)
@@ -5616,7 +5616,7 @@ int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x)
        int i;
        int max_cyber = (easy_band ? 1 : (dun_level / 50) + randint1(2));
        int count = 0;
-       u32b mode = PM_ALLOW_GROUP;
+       BIT_FLAGS mode = PM_ALLOW_GROUP;
 
        /* Summoned by a monster */
        if (who > 0)

diff --git a/src/spells3.c b/src/spells3.c
index 978e579..3cc8b7d 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -27,7 +27,7 @@
  * @param mode オプション
  * @return テレポート先として妥当ならばtrue
  */
-static bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, int y, int x, u32b mode)
+static bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, int y, int x, BIT_FLAGS mode)
 {
        monster_type *m_ptr = &m_list[m_idx];
        cave_type    *c_ptr = &cave[y][x];
@@ -63,7 +63,7 @@ static bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, int y, int x, u32b
  * Attempt to move the monster at least "dis/2" grids away.
  * But allow variation to prevent infinite loops.
  */
-bool teleport_away(MONSTER_IDX m_idx, int dis, u32b mode)
+bool teleport_away(MONSTER_IDX m_idx, int dis, BIT_FLAGS mode)
 {
        int oy, ox, d, i, min;
        int tries = 0;
@@ -178,7 +178,7 @@ bool teleport_away(MONSTER_IDX m_idx, int dis, u32b mode)
  * @param mode オプション
  * @return なし
  */
-void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, u32b mode)
+void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, BIT_FLAGS mode)
 {
        int ny, nx, oy, ox, d, i, min;
        int attempts = 500;
@@ -278,7 +278,7 @@ void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power,
  * @param mode オプション
  * @return テレポート先として妥当ならばtrue
  */
-bool cave_player_teleportable_bold(int y, int x, u32b mode)
+bool cave_player_teleportable_bold(int y, int x, BIT_FLAGS mode)
 {
        cave_type    *c_ptr = &cave[y][x];
        feature_type *f_ptr = &f_info[c_ptr->feat];
@@ -344,7 +344,7 @@ bool cave_player_teleportable_bold(int y, int x, u32b mode)
  * </pre>
  */
 
-bool teleport_player_aux(int dis, u32b mode)
+bool teleport_player_aux(int dis, BIT_FLAGS mode)
 {
        int candidates_at[MAX_TELEPORT_DISTANCE + 1];
        int total_candidates, cur_candidates;
@@ -461,7 +461,7 @@ bool teleport_player_aux(int dis, u32b mode)
  * @param mode オプション
  * @return なし
  */
-void teleport_player(int dis, u32b mode)
+void teleport_player(int dis, BIT_FLAGS mode)
 {
        int yy, xx;
 
@@ -556,7 +556,7 @@ void teleport_player_away(MONSTER_IDX m_idx, int dis)
  * This function allows teleporting into vaults (!)
  * </pre>
  */
-void teleport_player_to(POSITION ny, POSITION nx, u32b mode)
+void teleport_player_to(POSITION ny, POSITION nx, BIT_FLAGS mode)
 {
        POSITION y, x;
        int dis = 0, ctr = 0;
@@ -5235,7 +5235,7 @@ bool polymorph_monster(POSITION y, POSITION x)
        /* Handle polymorph */
        if (new_r_idx != old_r_idx)
        {
-               u32b mode = 0L;
+               BIT_FLAGS mode = 0L;
                bool preserve_hold_objects = back_m.hold_o_idx ? TRUE : FALSE;
                s16b this_o_idx, next_o_idx = 0;
 
@@ -5667,7 +5667,7 @@ bool eat_magic(int power)
  * @param mode 召喚オプション
  * @return ターンを消費した場合TRUEを返す
  */
-bool summon_kin_player(int level, int y, int x, u32b mode)
+bool summon_kin_player(int level, int y, int x, BIT_FLAGS mode)
 {
        bool pet = (bool)(mode & PM_FORCE_PET);
        if (!pet) mode |= PM_NO_PET;

diff --git a/src/wild.c b/src/wild.c
index 057e71b..59561c7 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -662,7 +662,7 @@ void wilderness_gen(void)
        /* Make some residents */
        for (i = 0; i < lim; i++)
        {
-               u32b mode = 0;
+               BIT_FLAGS mode = 0;
 
                if (!(generate_encounter || (one_in_(2) && (!p_ptr->town_num))))
                        mode |= PM_ALLOW_SLEEP;

diff --git a/src/wizard2.c b/src/wizard2.c
index a2afe69..3068fed 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -1036,7 +1036,7 @@ static void wiz_statistics(object_type *o_ptr)
        char ch;
        cptr quality;
 
-       u32b mode;
+       BIT_FLAGS mode;
 
        object_type forge;
        object_type     *q_ptr;

diff --git a/src/xtra2.c b/src/xtra2.c
index 0882e5c..dd7cf09 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -924,7 +924,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                        {
                                int wy = y, wx = x;
                                bool pet = is_pet(m_ptr);
-                               u32b mode = 0L;
+                               BIT_FLAGS mode = 0L;
 
                                if (pet) mode |= PM_FORCE_PET;
 
@@ -1001,7 +1001,7 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
 
                                if (attempts > 0)
                                {
-                                       u32b mode = 0L;
+                                       BIT_FLAGS mode = 0L;
                                        if (pet) mode |= PM_FORCE_PET;
 
                                        if (summon_specific((pet ? -1 : m_idx), wy, wx, 100, SUMMON_DAWN, mode))
@@ -1940,7 +1940,7 @@ msg_format("%sを葬り去った。", m_name);
                {
                        int dummy_y = m_ptr->fy;
                        int dummy_x = m_ptr->fx;
-                       u32b mode = 0L;
+                       BIT_FLAGS mode = 0L;
 
                        if (is_pet(m_ptr)) mode |= PM_FORCE_PET;
 
@@ -2338,7 +2338,7 @@ void verify_panel(void)
 /*
  * Monster health description
  */
-cptr look_mon_desc(monster_type *m_ptr, u32b mode)
+cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
 {
        monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
        bool         living;