summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrb0nk500 <b0nk@b0nk.xyz>2023-03-02 15:35:05 -0400
committermrb0nk500 <b0nk@b0nk.xyz>2023-03-02 15:35:05 -0400
commit0799a0377ad850ef5f140dfa6098302115548712 (patch)
tree483888f268174c57e4eca990b6883d8e30904454
parent83532988dbc1ef4ea96afb9975c1872dba3494ad (diff)
TPlyGuildCardTag: Fix compilation error in `_assign()`
Also makes it simpler too.
-rw-r--r--context.h6
-rw-r--r--include/pso/TPlyGuildCardTag.h6
2 files changed, 4 insertions, 8 deletions
diff --git a/context.h b/context.h
index cf894ab..2539293 100644
--- a/context.h
+++ b/context.h
@@ -632,10 +632,8 @@ public:
PRIVATE_MEMBER_ACCESSORS(u32, guildcard_number);
private:
void _assign(const TPlyGuildCardTag &src) {
- m_tag.tag0 = src.tag().tag0;
- m_tag.tag1 = src.tag().tag1;
- m_tag.tag2 = src.tag().tag2;
- m_guildcard_number = src.guildcard_number();
+ m_tag = src.m_tag;
+ m_guildcard_number = src.m_guildcard_number;
};
union {
diff --git a/include/pso/TPlyGuildCardTag.h b/include/pso/TPlyGuildCardTag.h
index f10b8e4..815685d 100644
--- a/include/pso/TPlyGuildCardTag.h
+++ b/include/pso/TPlyGuildCardTag.h
@@ -22,10 +22,8 @@ public:
PRIVATE_MEMBER_ACCESSORS(u32, guildcard_number);
private:
void _assign(const TPlyGuildCardTag &src) {
- m_tag.tag0 = src.tag().tag0;
- m_tag.tag1 = src.tag().tag1;
- m_tag.tag2 = src.tag().tag2;
- m_guildcard_number = src.guildcard_number();
+ m_tag = src.m_tag;
+ m_guildcard_number = src.m_guildcard_number;
};
union {