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/dungeon.cc | |
| parent | fc41a7d28d8896da79963d23ed1afba408e27470 (diff) | |
Rework RF{1,2,3,7,8,9}_* monster flags to use flag_set<>
Diffstat (limited to 'src/dungeon.cc')
| -rw-r--r-- | src/dungeon.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc index cd904f29..c05c6ed3 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -40,6 +40,7 @@ #include "monster2.hpp" #include "monster3.hpp" #include "monster_race.hpp" +#include "monster_race_flag.hpp" #include "monster_type.hpp" #include "modules.hpp" #include "notes.hpp" @@ -791,7 +792,7 @@ static void regen_monsters(void) if (!frac) frac = 1; /* Hack -- Some monsters regenerate quickly */ - if (r_ptr->flags2 & RF2_REGENERATE) frac *= 2; + if (r_ptr->flags & RF_REGENERATE) frac *= 2; /* Hack -- Regenerate */ @@ -828,7 +829,7 @@ static void regen_monsters(void) /* Hack -- Some monsters regenerate quickly */ auto const r_ptr = m_ptr->race(); - if (r_ptr->flags2 & RF2_REGENERATE) frac *= 2; + if (r_ptr->flags & RF_REGENERATE) frac *= 2; /* Hack -- Regenerate */ m_ptr->hp += frac; @@ -2967,7 +2968,7 @@ static void process_world(void) monster_type *m_ptr = &m_list[cave[my][mx].m_idx]; auto const r_ptr = m_ptr->race(); - if ((r_ptr->flags9 & RF9_IMPRESED) && can_create_companion()) + if ((r_ptr->flags & RF_IMPRESED) && can_create_companion()) { msg_format("And you have given the imprint to your %s!", r_ptr->name); m_ptr->status = MSTATUS_COMPANION; @@ -4512,7 +4513,7 @@ static void process_player(void) auto const r_ptr = m_ptr->race(); /* Skip non-multi-hued monsters */ - if (!(r_ptr->flags1 & RF1_ATTR_MULTI)) continue; + if (!(r_ptr->flags & RF_ATTR_MULTI)) continue; /* Reset the flag */ shimmer_monsters = TRUE; |