diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-06-20 22:49:05 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-20 22:49:05 +0200 |
commit | 68e2a10b2d76cb3a2f5aa6818b4b184b6a02ef14 (patch) | |
tree | ec51a0b9156c6a28fa2764441ca66db36441604b /src/generate.cc | |
parent | fc41a7d28d8896da79963d23ed1afba408e27470 (diff) |
Rework RF{1,2,3,7,8,9}_* monster flags to use flag_set<>
Diffstat (limited to 'src/generate.cc')
-rw-r--r-- | src/generate.cc | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/generate.cc b/src/generate.cc index ed35035c..6474f6de 100644 --- a/src/generate.cc +++ b/src/generate.cc @@ -21,6 +21,7 @@ #include "loadsave.hpp" #include "monster2.hpp" #include "monster_race.hpp" +#include "monster_race_flag.hpp" #include "monster_spell_flag.hpp" #include "monster_type.hpp" #include "object2.hpp" @@ -2674,10 +2675,10 @@ static bool_ vault_aux_jelly(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Also decline evil jellies (like death molds and shoggoths) */ - if (r_ptr->flags3 & RF3_EVIL) return (FALSE); + if (r_ptr->flags & RF_EVIL) return (FALSE); /* Require icky thing, jelly, mold, or mushroom */ if (!strchr("ijm,", r_ptr->d_char)) return (FALSE); @@ -2695,10 +2696,10 @@ static bool_ vault_aux_animal(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Require "animal" flag */ - if (!(r_ptr->flags3 & RF3_ANIMAL)) return (FALSE); + if (!(r_ptr->flags & RF_ANIMAL)) return (FALSE); /* Okay */ return (TRUE); @@ -2713,10 +2714,10 @@ static bool_ vault_aux_undead(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Require Undead */ - if (!(r_ptr->flags3 & RF3_UNDEAD)) return (FALSE); + if (!(r_ptr->flags & RF_UNDEAD)) return (FALSE); /* Okay */ return (TRUE); @@ -2731,7 +2732,7 @@ static bool_ vault_aux_chapel(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Require "priest" or Angel */ if (!((r_ptr->d_char == 'A') || strstr(r_ptr->name, "riest"))) @@ -2752,7 +2753,7 @@ static bool_ vault_aux_kennel(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Require a Zephyr Hound or a dog */ return ((r_ptr->d_char == 'Z') || (r_ptr->d_char == 'C')); @@ -2768,7 +2769,7 @@ static bool_ vault_aux_treasure(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Require "priest" or Angel */ if (!((r_ptr->d_char == '!') || (r_ptr->d_char == '|') || @@ -2798,7 +2799,7 @@ static bool_ vault_aux_clone(int r_idx) static bool_ vault_aux_symbol(int r_idx) { return ((r_info[r_idx].d_char == (r_info[template_race].d_char)) - && !(r_info[r_idx].flags1 & RF1_UNIQUE)); + && !(r_info[r_idx].flags & RF_UNIQUE)); } @@ -2810,7 +2811,7 @@ static bool_ vault_aux_orc(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Hack -- Require "o" monsters */ if (!strchr("o", r_ptr->d_char)) return (FALSE); @@ -2829,7 +2830,7 @@ static bool_ vault_aux_troll(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Hack -- Require "T" monsters */ if (!strchr("T", r_ptr->d_char)) return (FALSE); @@ -2847,7 +2848,7 @@ static bool_ vault_aux_giant(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Hack -- Require "P" monsters */ if (!strchr("P", r_ptr->d_char)) return (FALSE); @@ -2865,7 +2866,7 @@ static bool_ vault_aux_demon(int r_idx) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Hack -- Require "U" monsters */ if (!strchr("U", r_ptr->d_char)) return (FALSE); @@ -2968,7 +2969,7 @@ static void build_type5(int by0, int bx0) template_race = randint(max_r_idx - 2); /* Reject uniques */ - if (r_info[template_race].flags1 & RF1_UNIQUE) continue; + if (r_info[template_race].flags & RF_UNIQUE) continue; /* Reject OoD monsters in a loose fashion */ if (((r_info[template_race].level) + randint(5)) > @@ -3239,7 +3240,7 @@ static void build_type6(int by0, int bx0) { template_race = randint(max_r_idx - 2); } - while ((r_info[template_race].flags1 & RF1_UNIQUE) + while ((r_info[template_race].flags & RF_UNIQUE) || (((r_info[template_race].level) + randint(5)) > (dun_level + randint(5)))); @@ -3311,7 +3312,7 @@ static void build_type6(int by0, int bx0) monster_race *r_ptr = &r_info[r_idx]; /* Decline unique monsters */ - if (r_ptr->flags1 & RF1_UNIQUE) return (FALSE); + if (r_ptr->flags & RF_UNIQUE) return (FALSE); /* Hack -- Require "d" or "D" monsters */ if (!strchr("Dd", r_ptr->d_char)) return (FALSE); @@ -7820,7 +7821,7 @@ static bool_ cave_gen(void) } case FATE_FIND_R: { - if ((r_info[fates[i].r_idx].cur_num == 1) && (r_info[fates[i].r_idx].flags1 & RF1_UNIQUE)) fates[i].icky = TRUE; + if ((r_info[fates[i].r_idx].cur_num == 1) && (r_info[fates[i].r_idx].flags & RF_UNIQUE)) fates[i].icky = TRUE; break; } } |