From 7add9178473b74f5a922997d93bbca7d09e6a5c5 Mon Sep 17 00:00:00 2001
From: mrb0nk500 <b0nk@b0nk.xyz>
Date: Thu, 2 Mar 2023 15:25:43 -0400
Subject: TPlyGuildCardTag: Make variable members private, and add accessors
 for them

---
 include/pso/TPlyGuildCardTag.h | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'include/pso/TPlyGuildCardTag.h')

diff --git a/include/pso/TPlyGuildCardTag.h b/include/pso/TPlyGuildCardTag.h
index a29e977..57c30c5 100644
--- a/include/pso/TPlyGuildCardTag.h
+++ b/include/pso/TPlyGuildCardTag.h
@@ -5,19 +5,26 @@
 #include "pso/macros.h"
 #include <global_types.h>
 
+struct gc_tag {
+	u8 tag0;
+	u8 tag1;
+	u16 tag2;
+};
+
 class TPlyGuildCardTag {
 public:
-	union {
-		struct {
-			u8 tag0;
-			u8 tag1;
-			u16 tag2;
-		} tag;
-		u32 tag_u32;
-	};
-	u32 guildcard_number;
-
 	TPlyGuildCardTag &operator=(const TPlyGuildCardTag &src);
 	void bswap();
+
+	PRIVATE_MEMBER_ACCESSORS(gc_tag, tag);
+	PRIVATE_MEMBER_ACCESSORS(u32, tag_u32);
+	PRIVATE_MEMBER_ACCESSORS(u32, guildcard_number);
+
+private:
+	union {
+		gc_tag m_tag;
+		u32 m_tag_u32;
+	};
+	u32 m_guildcard_number;
 } __packed__;
 #endif
-- 
cgit v1.2.3-13-gbd6f