Rework RF{1,2,3,7,8,9}_* monster flags to use flag_set<>

1 files changed, 2 insertions, 7 deletions

diff --git a/src/rule_type.hpp b/src/rule_type.hpp
index d6424641..b88ce7bf 100644
--- a/src/rule_type.hpp
+++ b/src/rule_type.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "h-basic.h"
+#include "monster_race_flag_set.hpp"
 #include "monster_spell_flag_set.hpp"
 
 /* Define monster generation rules */
@@ -9,13 +10,7 @@ struct rule_type
 	byte mode = 0;                  /* Mode of combination of the monster flags */
 	byte percent = 0;               /* Percent of monsters affected by the rule */
 
-	u32b mflags1 = 0;               /* The monster flags that are allowed */
-	u32b mflags2 = 0;
-	u32b mflags3 = 0;
-	u32b mflags7 = 0;
-	u32b mflags8 = 0;
-	u32b mflags9 = 0;
-
+	monster_race_flag_set mflags;   /* The monster flags that are allowed */
 	monster_spell_flag_set mspells; /* Monster spells the are allowed */
 
 	char r_char[5] = { 0 };         /* Monster race allowed */