From 073ad3584fbf781ce10bef61ad4ff38850282f47 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 21 Jun 2016 13:37:02 +0200
Subject: Rework TR{1,2,3,4,5}_* flags to flag_set<>

---
 src/randart_part_type.hpp | 58 ++++++++++++++++++++---------------------------
 1 file changed, 25 insertions(+), 33 deletions(-)

(limited to 'src/randart_part_type.hpp')

diff --git a/src/randart_part_type.hpp b/src/randart_part_type.hpp
index c2fa5386..39329a57 100644
--- a/src/randart_part_type.hpp
+++ b/src/randart_part_type.hpp
@@ -1,43 +1,35 @@
 #pragma once
 
 #include "h-basic.h"
+#include "object_flag_set.hpp"
 
 /**
  * Random artifact part descriptor.
  */
 struct randart_part_type
 {
-	byte tval[20];
-	byte min_sval[20];
-	byte max_sval[20];
-
-	byte level;             /* Minimum level */
-	byte rarity;            /* Object rarity */
-	byte mrarity;           /* Object rarity */
-
-	s16b max_to_h;          /* Maximum to-hit bonus */
-	s16b max_to_d;          /* Maximum to-dam bonus */
-	s16b max_to_a;          /* Maximum to-ac bonus */
-
-	s32b max_pval;          /* Maximum pval */
-
-	s32b value;             /* power value */
-	s16b max;               /* Number of time it can appear on a single item */
-
-	u32b flags1;            /* Ego-Item Flags, set 1 */
-	u32b flags2;            /* Ego-Item Flags, set 2 */
-	u32b flags3;            /* Ego-Item Flags, set 3 */
-	u32b flags4;            /* Ego-Item Flags, set 4 */
-	u32b flags5;            /* Ego-Item Flags, set 5 */
-	u32b esp;               /* ESP flags */
-	u32b fego;              /* ego flags */
-
-	u32b aflags1;            /* Ego-Item Flags, set 1 */
-	u32b aflags2;            /* Ego-Item Flags, set 2 */
-	u32b aflags3;            /* Ego-Item Flags, set 3 */
-	u32b aflags4;            /* Ego-Item Flags, set 4 */
-	u32b aflags5;            /* Ego-Item Flags, set 5 */
-	u32b aesp;               /* ESP flags */
-
-	s16b power;             /* Power granted(if any) */
+	byte tval[20] { };
+	byte min_sval[20] { };
+	byte max_sval[20] { };
+
+	byte level = 0;                          /* Minimum level */
+	byte rarity = 0;                         /* Object rarity */
+	byte mrarity = 0;                        /* Object rarity */
+
+	s16b max_to_h = 0;                       /* Maximum to-hit bonus */
+	s16b max_to_d = 0;                       /* Maximum to-dam bonus */
+	s16b max_to_a = 0;                       /* Maximum to-ac bonus */
+
+	s32b max_pval = 0;                       /* Maximum pval */
+
+	s32b value = 0;                          /* power value */
+	s16b max = 0;                            /* Number of time it can appear on a single item */
+
+	object_flag_set flags;                   /* Ego item flags */
+
+	u32b fego = 0;                           /* ego flags */
+
+	object_flag_set aflags;                  /* Antagonistic ego item flags */
+
+	s16b power = 0;                          /* Power granted(if any) */
 };
-- 
cgit v1.2.3