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 | 59b5314b6b7880cfda73f34aed03a700fd523017 (patch) | |
| tree | 4b5255289c8216f2d7dcfac2824045e5c0acdc45 /src/cmd1.cc | |
| parent | fa5083020d4cc4d6d7471b461c430d40ed36c02e (diff) | |
Rework RF{4,5,6}_* monster spell flags to flag_set<>
Diffstat (limited to 'src/cmd1.cc')
| -rw-r--r-- | src/cmd1.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd1.cc b/src/cmd1.cc index 69592b71..dddcbcef 100644 --- a/src/cmd1.cc +++ b/src/cmd1.cc @@ -25,6 +25,7 @@ #include "monster2.hpp" #include "monster3.hpp" #include "monster_race.hpp" +#include "monster_spell_flag.hpp" #include "monster_type.hpp" #include "object1.hpp" #include "object2.hpp" @@ -2228,7 +2229,7 @@ void py_attack(int y, int x, int max_blow) /* Stunning blow */ if (magik(get_skill(SKILL_STUN)) && (o_ptr->tval == TV_HAFTED) && (o_ptr->weight > 50) && done_crit) { - if (!(r_ptr->flags4 & RF4_BR_SOUN) && !(r_ptr->flags4 & RF4_BR_WALL) && k) + if (!(r_ptr->spells & SF_BR_SOUN) && !(r_ptr->spells & SF_BR_WALL) && k) { int tmp; @@ -2476,7 +2477,7 @@ void py_attack(int y, int x, int max_blow) (randint(90) > m_ptr->level)) { if (!((r_ptr->flags1 & RF1_UNIQUE) || - (r_ptr->flags4 & RF4_BR_CHAO) || + (r_ptr->spells & SF_BR_CHAO) || (m_ptr->mflag & MFLAG_QUEST))) { /* Handle polymorph */ |