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/monster_ego.hpp | |
| parent | fa5083020d4cc4d6d7471b461c430d40ed36c02e (diff) | |
Rework RF{4,5,6}_* monster spell flags to flag_set<>
Diffstat (limited to 'src/monster_ego.hpp')
| -rw-r--r-- | src/monster_ego.hpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/monster_ego.hpp b/src/monster_ego.hpp index 1154c537..010ff98f 100644 --- a/src/monster_ego.hpp +++ b/src/monster_ego.hpp @@ -2,6 +2,7 @@ #include "h-basic.h" #include "monster_blow.hpp" +#include "monster_spell_flag_set.hpp" #include <array> @@ -55,24 +56,24 @@ struct monster_ego u32b mflags1 = 0; u32b mflags2 = 0; u32b mflags3 = 0; - u32b mflags4 = 0; - u32b mflags5 = 0; - u32b mflags6 = 0; u32b mflags7 = 0; u32b mflags8 = 0; u32b mflags9 = 0; + /* Monster spells */ + monster_spell_flag_set mspells; + /* Negative Flags, to be removed from the monster flags */ u32b nflags1 = 0; u32b nflags2 = 0; u32b nflags3 = 0; - u32b nflags4 = 0; - u32b nflags5 = 0; - u32b nflags6 = 0; u32b nflags7 = 0; u32b nflags8 = 0; u32b nflags9 = 0; + /* Negative spells; to be removed from the monster spells */ + monster_spell_flag_set nspells; + s16b level = 0; /* Level of creature */ s16b rarity = 0; /* Rarity of creature */ |