Merge branch 'upstream'

1 files changed, 7 insertions, 12 deletions

diff --git a/src/rule_type.hpp b/src/rule_type.hpp
index a8b35ffa..b88ce7bf 100644
--- a/src/rule_type.hpp
+++ b/src/rule_type.hpp
@@ -1,22 +1,17 @@
 #pragma once
 
 #include "h-basic.h"
+#include "monster_race_flag_set.hpp"
+#include "monster_spell_flag_set.hpp"
 
 /* Define monster generation rules */
 struct rule_type
 {
-	byte mode;                      /* Mode of combination of the monster flags */
-	byte percent;                   /* Percent of monsters affected by the rule */
+	byte mode = 0;                  /* Mode of combination of the monster flags */
+	byte percent = 0;               /* Percent of monsters affected by the rule */
 
-	u32b mflags1;                   /* The monster flags that are allowed */
-	u32b mflags2;
-	u32b mflags3;
-	u32b mflags4;
-	u32b mflags5;
-	u32b mflags6;
-	u32b mflags7;
-	u32b mflags8;
-	u32b mflags9;
+	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];                 /* Monster race allowed */
+	char r_char[5] = { 0 };         /* Monster race allowed */
 };