TPlyGuildCardTag: Make variable members private, and add accessors for

them

1 files changed, 19 insertions, 5 deletions

diff --git a/context.h b/context.h
index fb4b418..b268acf 100644
--- a/context.h
+++ b/context.h
@@ -534,6 +534,13 @@ struct packet_header {
 	void bswap();
 } __packed__;
 
+// pso/TPlyGuildCardTag.h
+struct gc_tag {
+	u8 tag0;
+	u8 tag1;
+	u16 tag2;
+};
+
 // TTcpSocket.cpp, but they're really from AVE-TCP
 struct at_ip4_opt {
 	u8 ttl;
@@ -610,13 +617,20 @@ static inline void operator|=(object_flags &a, object_flags b) { a = a | b; };
 // Class defs.
 
 class TPlyGuildCardTag {
-	public:
-	u8 tag0;
-	u8 tag1;
-	u16 tag2;
-	u32 guildcard_number;
+public:
 	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__;
 
 // pso/PSOV3EncryptionTCP.h