summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormrb0nk500 <b0nk@b0nk.xyz>2023-03-02 15:25:43 -0400
committermrb0nk500 <b0nk@b0nk.xyz>2023-03-02 15:25:43 -0400
commit7add9178473b74f5a922997d93bbca7d09e6a5c5 (patch)
treea9d576676f584f236fce5cb28be7434c6ce33dcf /include
parentedffe62dde3967f4065f5baf45d3115d574fe3cf (diff)
TPlyGuildCardTag: Make variable members private, and add accessors for
them
Diffstat (limited to 'include')
-rw-r--r--include/pso/TPlyGuildCardTag.h27
1 files changed, 17 insertions, 10 deletions
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