diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-03-29 20:32:55 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-03-29 20:32:55 +0200 |
| commit | 899041ce6b7cbc33e8cb3124aaa54b518c4a4b72 (patch) | |
| tree | 72d9bd8e36db2b8392512db677157b6f32c10b49 /src/monster2.cc | |
| parent | c8df88d8c61197d8f019efa0ba373ed14a28d914 (diff) | |
Convert dungeon_info_type to use new flag_set
Diffstat (limited to 'src/monster2.cc')
| -rw-r--r-- | src/monster2.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/monster2.cc b/src/monster2.cc index 4649f446..e166950f 100644 --- a/src/monster2.cc +++ b/src/monster2.cc @@ -11,6 +11,7 @@ #include "artifact_type.hpp" #include "cave.hpp" #include "cave_type.hpp" +#include "dungeon_flag.hpp" #include "dungeon_info_type.hpp" #include "files.hpp" #include "hook_new_monster_in.hpp" @@ -215,7 +216,7 @@ static int pick_ego_monster(monster_race const *r_ptr) int tries = max_re_idx + 10; monster_ego *re_ptr; - if ((!(dungeon_flags2 & DF2_ELVEN)) && (!(dungeon_flags2 & DF2_DWARVEN))) + if ((!(dungeon_flags & DF_ELVEN)) && (!(dungeon_flags & DF_DWARVEN))) { /* No townspeople ego */ if (!r_ptr->level) return 0; @@ -250,9 +251,9 @@ static int pick_ego_monster(monster_race const *r_ptr) /* Bypass restrictions for themed townspeople */ else { - if (dungeon_flags2 & DF2_ELVEN) + if (dungeon_flags & DF_ELVEN) ego = test_mego_name("Elven"); - else if (dungeon_flags2 & DF2_DWARVEN) + else if (dungeon_flags & DF_DWARVEN) ego = test_mego_name("Dwarven"); if (mego_ok(r_ptr, ego)) @@ -2548,18 +2549,18 @@ s16b place_monster_one(int y, int x, int r_idx, int ego, bool_ slp, int status) } - if (dungeon_flags2 & DF2_ADJUST_LEVEL_1_2) + if (dungeon_flags & DF_ADJUST_LEVEL_1_2) { min_level = max_level = dun_level / 2; add_level = TRUE; } - if (dungeon_flags1 & DF1_ADJUST_LEVEL_1) + if (dungeon_flags & DF_ADJUST_LEVEL_1) { if (!min_level) min_level = dun_level; max_level = dun_level; add_level = TRUE; } - if (dungeon_flags1 & DF1_ADJUST_LEVEL_2) + if (dungeon_flags & DF_ADJUST_LEVEL_2) { if (!min_level) min_level = dun_level * 2; max_level = dun_level * 2; |