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/cmd5.cc | |
| parent | fc41a7d28d8896da79963d23ed1afba408e27470 (diff) | |
Rework RF{1,2,3,7,8,9}_* monster flags to use flag_set<>
Diffstat (limited to 'src/cmd5.cc')
| -rw-r--r-- | src/cmd5.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd5.cc b/src/cmd5.cc index 2c9798de..29651cf2 100644 --- a/src/cmd5.cc +++ b/src/cmd5.cc @@ -16,6 +16,7 @@ #include "lua_bind.hpp" #include "monster2.hpp" #include "monster_race.hpp" +#include "monster_race_flag.hpp" #include "monster_spell_flag.hpp" #include "object1.hpp" #include "object2.hpp" @@ -592,7 +593,7 @@ cptr symbiote_name(bool_ capitalize) monster_race *r_ptr = &r_info[o_ptr->pval]; cptr s = NULL; - if (r_ptr->flags1 & RF1_UNIQUE) + if (r_ptr->flags & RF_UNIQUE) { /* Unique monster; no preceding "your", and ignore our name. */ strncpy(buf, r_ptr->name, sizeof(buf)); @@ -857,7 +858,7 @@ static void apply_monster_power(monster_race const *r_ptr, std::size_t monster_s int const rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1); /* 'Powerful' monsters have wider radii */ - int rad = (r_ptr->flags2 & RF2_POWERFUL) + int rad = (r_ptr->flags & RF_POWERFUL) ? 1 + (p_ptr->lev / 15) : 1 + (p_ptr->lev / 20); |