From 59b5314b6b7880cfda73f34aed03a700fd523017 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Rework RF{4,5,6}_* monster spell flags to flag_set<> --- src/monster_race.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/monster_race.hpp') diff --git a/src/monster_race.hpp b/src/monster_race.hpp index 94896c64..3a13e4b4 100644 --- a/src/monster_race.hpp +++ b/src/monster_race.hpp @@ -3,6 +3,7 @@ #include "body.hpp" #include "h-basic.h" #include "monster_blow.hpp" +#include "monster_spell_flag_set.hpp" #include "obj_theme.hpp" #include @@ -50,13 +51,12 @@ struct monster_race u32b flags1 = 0; /* Flags 1 (general) */ u32b flags2 = 0; /* Flags 2 (abilities) */ u32b flags3 = 0; /* Flags 3 (race/resist) */ - u32b flags4 = 0; /* Flags 4 (inate/breath) */ - u32b flags5 = 0; /* Flags 5 (normal spells) */ - u32b flags6 = 0; /* Flags 6 (special spells) */ u32b flags7 = 0; /* Flags 7 (movement related abilities) */ u32b flags8 = 0; /* Flags 8 (wilderness info) */ u32b flags9 = 0; /* Flags 9 (drops info) */ + monster_spell_flag_set spells; /* Spells */ + std::array blow { }; /* Up to four blows per round */ byte body_parts[BODY_MAX] = { 0 }; /* To help to decide what to use when body changing */ -- cgit v1.2.3