diff options
Diffstat (limited to 'src/q_rand.cc')
| -rw-r--r-- | src/q_rand.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/q_rand.cc b/src/q_rand.cc index 26903848..f22675b7 100644 --- a/src/q_rand.cc +++ b/src/q_rand.cc @@ -16,6 +16,7 @@ #include "monster2.hpp" #include "monster3.hpp" #include "monster_race.hpp" +#include "monster_race_flag.hpp" #include "monster_spell_flag.hpp" #include "monster_type.hpp" #include "object1.hpp" @@ -112,23 +113,23 @@ void initialize_random_quests(int n) r_ptr = &r_info[q_ptr->r_idx]; /* Accept only monsters that can be generated */ - if (r_ptr->flags9 & RF9_SPECIAL_GENE) continue; - if (r_ptr->flags9 & RF9_NEVER_GENE) continue; + if (r_ptr->flags & RF_SPECIAL_GENE) continue; + if (r_ptr->flags & RF_NEVER_GENE) continue; /* Accept only monsters that are not breeders */ if (r_ptr->spells & SF_MULTIPLY) continue; /* Forbid joke monsters */ - if (r_ptr->flags8 & RF8_JOKEANGBAND) continue; + if (r_ptr->flags & RF_JOKEANGBAND) continue; /* Accept only monsters that are not friends */ - if (r_ptr->flags7 & RF7_PET) continue; + if (r_ptr->flags & RF_PET) continue; /* Refuse nazguls */ - if (r_ptr->flags7 & RF7_NAZGUL) continue; + if (r_ptr->flags & RF_NAZGUL) continue; /* Accept only monsters that are not good */ - if (r_ptr->flags3 & RF3_GOOD) continue; + if (r_ptr->flags & RF_GOOD) continue; /* If module says a monster race is friendly, then skip */ if (modules[game_module_idx].race_status != NULL) @@ -151,11 +152,11 @@ void initialize_random_quests(int n) if (!ok) continue; /* No mutliple uniques */ - if ((r_ptr->flags1 & RF1_UNIQUE) && + if ((r_ptr->flags & RF_UNIQUE) && ((q_ptr->type != 1) || (r_ptr->max_num == -1))) continue; /* No single non uniques */ - if ((!(r_ptr->flags1 & RF1_UNIQUE)) && (q_ptr->type == 1)) continue; + if ((!(r_ptr->flags & RF_UNIQUE)) && (q_ptr->type == 1)) continue; /* Level restriction */ min_level = (rl > RQ_LEVEL_CAP) ? RQ_LEVEL_CAP : rl; @@ -175,7 +176,7 @@ void initialize_random_quests(int n) } else { - if (r_ptr->flags1 & RF1_UNIQUE) + if (r_ptr->flags & RF_UNIQUE) { r_ptr->max_num = -1; } |